bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 0.5.1
by John Arbash Meinel Just an initial working step. | 1 | #!/usr/bin/env python
 | 
| 2 | """\
 | |
| 3 | This is an attempt to take the internal delta object, and represent
 | |
| 4 | it as a single-file text-only changeset.
 | |
| 5 | This should have commands for both generating a changeset,
 | |
| 6 | and for applying a changeset.
 | |
| 7 | """
 | |
| 8 | ||
| 0.5.99
by John Arbash Meinel Updating to current Branch.open() and RevisionSpec changes. | 9 | import sys | 
| 1185.82.78
by Aaron Bentley Cleanups | 10 | |
| 11 | from bzrlib.branch import Branch | |
| 0.5.114
by John Arbash Meinel Hiding OPTIONS since it has been removed. Updating for the new Branch.open_containing() | 12 | from bzrlib.commands import Command, register_command | 
| 1185.82.78
by Aaron Bentley Cleanups | 13 | import bzrlib.errors as errors | 
| 0.5.121
by John Arbash Meinel Fixing options to apply-changeset | 14 | from bzrlib.option import Option | 
| 1185.82.10
by John Arbash Meinel Worked out the changeset command. | 15 | from bzrlib.revision import (common_ancestor, MultipleRevisionSources, | 
| 1185.82.54
by Aaron Bentley Removed import of get_intervening revision | 16 | NULL_REVISION) | 
| 1185.84.4
by Aaron Bentley Use parent branch as default base branch | 17 | from bzrlib.trace import note | 
| 1793.2.15
by Aaron Bentley Update bundle command to use urlutils for emitting saved location | 18 | from bzrlib import urlutils | 
| 1185.82.78
by Aaron Bentley Cleanups | 19 | |
| 0.5.1
by John Arbash Meinel Just an initial working step. | 20 | |
| 0.5.81
by John Arbash Meinel Cleaning up from pychecker. | 21 | class cmd_send_changeset(Command): | 
| 0.5.24
by John Arbash Meinel Adding send-changeset from Johan Rydberg | 22 | """Send a bundled up changset via mail. | 
| 23 | ||
| 24 |     If no revision has been specified, the last commited change will
 | |
| 25 |     be sent.
 | |
| 26 | ||
| 0.5.30
by John Arbash Meinel Merging send-changeset updates from jrydberg | 27 |     Subject of the mail can be specified by the --message option,
 | 
| 0.5.24
by John Arbash Meinel Adding send-changeset from Johan Rydberg | 28 |     otherwise information from the changeset log will be used.
 | 
| 0.5.30
by John Arbash Meinel Merging send-changeset updates from jrydberg | 29 | |
| 30 |     A editor will be spawned where the user may enter a description
 | |
| 31 |     of the changeset.  The description can be read from a file with
 | |
| 32 |     the --file FILE option.
 | |
| 0.5.24
by John Arbash Meinel Adding send-changeset from Johan Rydberg | 33 |     """
 | 
| 0.5.31
by John Arbash Meinel Some cleanup to the send_changeset work. | 34 | takes_options = ['revision', 'message', 'file'] | 
| 0.5.24
by John Arbash Meinel Adding send-changeset from Johan Rydberg | 35 | takes_args = ['to?'] | 
| 36 | ||
| 0.5.31
by John Arbash Meinel Some cleanup to the send_changeset work. | 37 | def run(self, to=None, message=None, revision=None, file=None): | 
| 0.5.68
by John Arbash Meinel (broken), starting to change the syntax of the command to allow cset to take a base and a target. | 38 | from bzrlib.errors import BzrCommandError | 
| 0.5.31
by John Arbash Meinel Some cleanup to the send_changeset work. | 39 | from send_changeset import send_changeset | 
| 0.5.30
by John Arbash Meinel Merging send-changeset updates from jrydberg | 40 | |
| 0.5.24
by John Arbash Meinel Adding send-changeset from Johan Rydberg | 41 | if isinstance(revision, (list, tuple)): | 
| 42 | if len(revision) > 1: | |
| 43 | raise BzrCommandError('We do not support rollup-changesets yet.') | |
| 44 | revision = revision[0] | |
| 45 | ||
| 0.5.99
by John Arbash Meinel Updating to current Branch.open() and RevisionSpec changes. | 46 | b = Branch.open_containing('.') | 
| 0.5.24
by John Arbash Meinel Adding send-changeset from Johan Rydberg | 47 | |
| 48 | if not to: | |
| 49 | try: | |
| 50 | to = b.controlfile('x-send-address', 'rb').read().strip('\n') | |
| 51 | except: | |
| 52 | raise BzrCommandError('destination address is not known') | |
| 53 | ||
| 0.5.31
by John Arbash Meinel Some cleanup to the send_changeset work. | 54 | if not isinstance(revision, (list, tuple)): | 
| 55 | revision = [revision] | |
| 0.5.24
by John Arbash Meinel Adding send-changeset from Johan Rydberg | 56 | |
| 0.5.31
by John Arbash Meinel Some cleanup to the send_changeset work. | 57 | send_changeset(b, revision, to, message, file) | 
| 0.5.24
by John Arbash Meinel Adding send-changeset from Johan Rydberg | 58 | |
| 1185.82.10
by John Arbash Meinel Worked out the changeset command. | 59 | |
| 1185.82.130
by Aaron Bentley Rename changesets to revision bundles | 60 | class cmd_bundle_revisions(Command): | 
| 61 | """Generate a revision bundle. | |
| 0.5.1
by John Arbash Meinel Just an initial working step. | 62 | |
| 1185.82.130
by Aaron Bentley Rename changesets to revision bundles | 63 |     This bundle contains all of the meta-information of a
 | 
| 0.5.1
by John Arbash Meinel Just an initial working step. | 64 |     diff, rather than just containing the patch information.
 | 
| 0.5.7
by John Arbash Meinel Added a bunch more information about changesets. Can now read back in all of the meta information. | 65 | |
| 1185.82.81
by Aaron Bentley Remove unused functionality | 66 |     You can apply it to another tree using 'bzr merge'.
 | 
| 67 | ||
| 1185.84.1
by Aaron Bentley Use full command name in bundle-revisions help | 68 |     bzr bundle-revisions
 | 
| 1793.2.14
by Aaron Bentley Clean up bundle revision specification | 69 |         - Generate a bundle relative to a remembered location
 | 
| 1185.84.1
by Aaron Bentley Use full command name in bundle-revisions help | 70 |     bzr bundle-revisions BASE
 | 
| 1185.82.130
by Aaron Bentley Rename changesets to revision bundles | 71 |         - Bundle to apply the current tree into BASE
 | 
| 1185.84.1
by Aaron Bentley Use full command name in bundle-revisions help | 72 |     bzr bundle-revisions --revision A
 | 
| 1793.2.14
by Aaron Bentley Clean up bundle revision specification | 73 |         - Bundle to apply revision A to remembered location 
 | 
| 1185.84.1
by Aaron Bentley Use full command name in bundle-revisions help | 74 |     bzr bundle-revisions --revision A..B
 | 
| 1185.82.130
by Aaron Bentley Rename changesets to revision bundles | 75 |         - Bundle to transform A into B
 | 
| 0.5.1
by John Arbash Meinel Just an initial working step. | 76 |     """
 | 
| 1804.1.1
by Aaron Bentley Add support for submit location to bundles | 77 | takes_options = ['verbose', 'revision', 'remember', | 
| 1744.1.1
by Alexander Belchenko Added --output option for bundle-revisions command | 78 | Option("output", help="write bundle to specified file", | 
| 79 | type=unicode)] | |
| 1185.82.10
by John Arbash Meinel Worked out the changeset command. | 80 | takes_args = ['base?'] | 
| 1185.82.130
by Aaron Bentley Rename changesets to revision bundles | 81 | aliases = ['bundle'] | 
| 0.5.1
by John Arbash Meinel Just an initial working step. | 82 | |
| 1804.1.1
by Aaron Bentley Add support for submit location to bundles | 83 | def run(self, base=None, revision=None, output=None, remember=False): | 
| 0.5.81
by John Arbash Meinel Cleaning up from pychecker. | 84 | from bzrlib import user_encoding | 
| 1185.82.130
by Aaron Bentley Rename changesets to revision bundles | 85 | from bzrlib.bundle.serializer import write_bundle | 
| 1185.82.10
by John Arbash Meinel Worked out the changeset command. | 86 | |
| 1185.84.4
by Aaron Bentley Use parent branch as default base branch | 87 | target_branch = Branch.open_containing(u'.')[0] | 
| 1804.1.1
by Aaron Bentley Add support for submit location to bundles | 88 | |
| 89 | if base is None: | |
| 90 | base_specified = False | |
| 91 | else: | |
| 92 | base_specified = True | |
| 1185.84.4
by Aaron Bentley Use parent branch as default base branch | 93 | |
| 1185.82.10
by John Arbash Meinel Worked out the changeset command. | 94 | if revision is None: | 
| 95 | target_revision = target_branch.last_revision() | |
| 1793.2.14
by Aaron Bentley Clean up bundle revision specification | 96 | elif len(revision) < 3: | 
| 97 | target_revision = revision[-1].in_history(target_branch).rev_id | |
| 98 | if len(revision) == 2: | |
| 99 | if base_specified: | |
| 100 | raise errors.BzrCommandError('Cannot specify base as well' | |
| 101 | ' as two revision arguments.') | |
| 1185.82.85
by Aaron Bentley Swap meaning of two-argument 'changeset' to match 'merge' | 102 | base_revision = revision[0].in_history(target_branch).rev_id | 
| 1185.82.10
by John Arbash Meinel Worked out the changeset command. | 103 | else: | 
| 104 | raise errors.BzrCommandError('--revision takes 1 or 2 parameters') | |
| 105 | ||
| 1793.2.14
by Aaron Bentley Clean up bundle revision specification | 106 | if revision is None or len(revision) < 2: | 
| 107 | submit_branch = target_branch.get_submit_branch() | |
| 108 | if base is None: | |
| 109 | base = submit_branch | |
| 110 | if base is None: | |
| 111 | base = target_branch.get_parent() | |
| 112 | if base is None: | |
| 113 | raise errors.BzrCommandError("No base branch known or" | |
| 114 | " specified.") | |
| 115 | elif not base_specified: | |
| 1793.2.16
by Aaron Bentley More notes on 'note' | 116 |                 # FIXME:
 | 
| 117 |                 # note() doesn't pay attention to terminal_encoding() so
 | |
| 118 |                 # we must format with 'ascii' to be safe
 | |
| 119 | note('Using saved location: %s', | |
| 120 | urlutils.unescape_for_display(base, 'ascii')) | |
| 1793.2.14
by Aaron Bentley Clean up bundle revision specification | 121 | base_branch = Branch.open(base) | 
| 122 | ||
| 123 |             # We don't want to lock the same branch across
 | |
| 124 |             # 2 different branches
 | |
| 125 | if target_branch.base == base_branch.base: | |
| 126 | base_branch = target_branch | |
| 127 | if submit_branch is None or remember: | |
| 128 | if base_specified: | |
| 129 | target_branch.set_submit_branch(base_branch.base) | |
| 130 | elif remember: | |
| 131 | raise errors.BzrCommandError('--remember requires a branch' | |
| 132 | ' to be specified.') | |
| 1185.82.23
by Aaron Bentley Switch the fetcher | 133 | target_branch.repository.fetch(base_branch.repository, | 
| 1793.2.14
by Aaron Bentley Clean up bundle revision specification | 134 | base_branch.last_revision()) | 
| 135 | base_revision = common_ancestor(base_branch.last_revision(), | |
| 136 | target_revision, | |
| 137 | target_branch.repository) | |
| 138 | ||
| 1744.1.1
by Alexander Belchenko Added --output option for bundle-revisions command | 139 | |
| 140 | if output is not None: | |
| 141 | fileobj = file(output, 'wb') | |
| 142 | else: | |
| 143 | fileobj = sys.stdout | |
| 1927.1.1
by John Arbash Meinel Lock the repository more often | 144 | target_branch.repository.lock_read() | 
| 145 | try: | |
| 146 | write_bundle(target_branch.repository, target_revision, | |
| 147 | base_revision, fileobj) | |
| 148 | finally: | |
| 149 | target_branch.repository.unlock() | |
| 1185.82.10
by John Arbash Meinel Worked out the changeset command. | 150 | |
| 0.5.1
by John Arbash Meinel Just an initial working step. | 151 | |
| 0.5.81
by John Arbash Meinel Cleaning up from pychecker. | 152 | class cmd_verify_changeset(Command): | 
| 0.5.7
by John Arbash Meinel Added a bunch more information about changesets. Can now read back in all of the meta information. | 153 | """Read a written changeset, and make sure it is valid. | 
| 154 | ||
| 155 |     """
 | |
| 156 | takes_args = ['filename?'] | |
| 157 | ||
| 158 | def run(self, filename=None): | |
| 0.5.81
by John Arbash Meinel Cleaning up from pychecker. | 159 | from read_changeset import read_changeset | 
| 0.5.103
by John Arbash Meinel Updated to having a changeset specific message. | 160 |         #from bzrlib.xml import serializer_v4
 | 
| 0.5.56
by John Arbash Meinel A couple more fixups, it seems actually capable now of writing out a changeset, and reading it back. | 161 | |
| 0.5.114
by John Arbash Meinel Hiding OPTIONS since it has been removed. Updating for the new Branch.open_containing() | 162 | b, relpath = Branch.open_containing('.') | 
| 0.5.56
by John Arbash Meinel A couple more fixups, it seems actually capable now of writing out a changeset, and reading it back. | 163 | |
| 0.5.7
by John Arbash Meinel Added a bunch more information about changesets. Can now read back in all of the meta information. | 164 | if filename is None or filename == '-': | 
| 165 | f = sys.stdin | |
| 166 | else: | |
| 0.5.33
by John Arbash Meinel Use universal newlines wherever appropriate. | 167 | f = open(filename, 'U') | 
| 0.5.7
by John Arbash Meinel Added a bunch more information about changesets. Can now read back in all of the meta information. | 168 | |
| 0.5.88
by John Arbash Meinel Fixed a bug in the rename code, added more tests. | 169 | cset_info, cset_tree = read_changeset(f, b) | 
| 0.5.103
by John Arbash Meinel Updated to having a changeset specific message. | 170 |         # print cset_info
 | 
| 171 |         # print cset_tree
 | |
| 172 |         #serializer_v4.write(cset_tree.inventory, sys.stdout)
 |