Merge lp:~oddbloke/bzr/183559-switch-r into lp:bzr

[Martin Pool]

[Martin Pool (mbp)]

Fix for https://bugs.edge.launchpad.net/bzr/+bug/183559 adding "switch -r".

I haven't read it yet but it would be good for someone to review it and if necessary pick it up.

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Martin Pool wrote:
> Martin Pool has proposed merging lp:~daniel-thewatkins/bzr/183559-switch-r into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
> Related bugs:
> #183559 bzr switch should have a -r option
> https://bugs.launchpad.net/bugs/183559
>
>
> Fix for https://bugs.edge.launchpad.net/bzr/+bug/183559 adding "switch -r".
>
> I haven't read it yet but it would be good for someone to review it and if necessary pick it up.
>

1) Lots of conflicts. Looks like it was done back in 1.12 or so. A lot
of stuff doesn't line up. Probably mostly shallow

2)

=== modified file 'bzrlib/builtins.py'
- --- bzrlib/builtins.py 2009-12-23 05:42:33 +0000
+++ bzrlib/builtins.py 2010-01-05 03:39:25 +0000
@@ -5493,22 +5493,42 @@
     that of the master.
     """

- - takes_args = ['to_location']
+ takes_args = ['to_location?']
     takes_options = [Option('force',
+<<<<<<< TREE
                         help='Switch even if local commits will be lost.'),
                      Option('create-branch', short_name='b',
                         help='Create the target branch from this one
before'
                              ' switching to it.'),
+=======
+ help='Switch even if local commits will be lost.'),
+ 'revision'
+>>>>>>> MERGE-SOURCE
                      ]

^- This looks like he made it so "bzr switch -r XXX" changes the local
tree to a different rev. Which sounds like overlap with the new "bzr
update -r" functionality.

I would probably pick one and stick with it, rather than having 2 ways
to do it.

TBH switch comes to mind faster than update, though I think update fits
SVN usage better.

The rest of the code just passing down a revision_id to switch, and
having it use that RevisionTree rather than just the
to_branch.basis_tree() seems fine.

 review: needs_fixing

I'm not setting this to WIP yet, as maybe the patch-pilot wants to pick
it up?

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAktCuiQACgkQJdeBCYSNAAP2+QCgkRtmKt2F+DDP1+SmLAQNDUTD
9lQAn0Rxvuw4TIsYiF9KHtmlJDQ2tWuQ
=po4T
-----END PGP SIGNATURE-----

review: Needs Fixing

[Andrew Bennetts (spiv)]

Sure, I'll pick it up.

[Andrew Bennetts (spiv)]

Daniel, I just noticed you haven't signed the Canonical's contributor's agreement... would you mind doing so? <http://www.canonical.com/contributors>. Thanks!

I've put an updated version of this up for review at <https://code.edge.launchpad.net/~spiv/bzr/switch-r-183559/+merge/17195>.

(Marking "Disapprove/Rejected" because I don't know a better way to tell LP that my proposal supersedes this one.)

review: Disapprove

=== modified file 'NEWS'
--- NEWS	2010-01-04 05:40:01 +0000
+++ NEWS	2010-01-05 03:39:25 +0000
@@ -1,5 +1,6 @@
 ####################
 Bazaar Release Notes
+<<<<<<< TREE
 ####################
 
 .. contents:: List of Releases
@@ -3360,6 +3361,205 @@
 
 :Codename: "Eyes up!"
 :Released: 2009-01-19
+=======
+--------------------
+
+.. contents::
+
+IN DEVELOPMENT
+--------------
+
+  COMPATIBILITY BREAKS:
+
+    * By default, ``bzr status`` after a merge now shows just the pending
+      merge tip revisions. This improves the signal-to-noise ratio after
+      merging from trunk and completes much faster. To see all merged
+      revisions, use the new ``-v`` flag.  (Ian Clatworthy)
+
+    * ``bzr log --line`` now shows any tags after the date and before
+      the commit message. If you have scripts which parse the output
+      from this command, you may need to adjust them accordingly.
+      (Ian Clatworthy)
+
+    * ``bzr log --short`` now shows any additional revision properties
+      after the date and before the commit message.  Scripts that parse 
+      output of the log command in this situation may need to adjust.
+      (Neil Martinsen-Burrell)
+
+    * The experimental formats ``1.12-preview`` and ``1.12-preview-rich-root``
+      have been renamed ``development-wt5`` and ``development-wt5-rich-root``
+      respectively, given they are not ready for release in 1.12.
+      (Ian Clatworthy)
+
+  NEW FEATURES:
+
+    * Add support for filtering `bzr missing` on revisions.  Remote revisions
+      can be filtered using `bzr missing -r -20..-10` and local revisions can
+      be filtered using `bzr missing --my-revision -20..-10`.
+      (Marius Kruger)
+
+    * ``bzr log -p`` displays the patch diff for each revision.
+      When logging a file, the diff only includes changes to that file.
+      (Ian Clatworthy, #202331, #227335)
+
+    * ``bzr log`` supports a new option called ``-n N`` or ``--level N``.
+      A value of 0 (zero) means "show all nested merge revisions" while
+      a value of 1 (one) means "show just the top level". Values above
+      1 can be used to see a limited amount of nesting. That can be
+      useful for seeing the level or two below PQM submits for example.
+      To force the ``--short`` and ``--line`` formats to display all nested
+      merge revisions just like ``--long`` does by default, use a command
+      like ``bzr log --short -n0``. To display just the mainline using
+      ``--long`` format, ``bzr log --long -n1``.
+      (Ian Clatworthy)
+
+  IMPROVEMENTS:
+
+    * ``bzr add`` more clearly communicates success vs failure.
+      (Daniel Watkins)
+
+    * ``bzr init`` will now print a little less verbose output.
+      (Marius Kruger)
+
+    * ``bzr log`` is now much faster in many use cases, particularly
+      at incrementally displaying results and filtering by a
+      revision range. (Ian Clatworthy)
+
+    * ``bzr log --short`` and ``bzr log --line`` now show tags, if any,
+      for each revision. The tags are shown comma-separated inside
+      ``{}``. For short format, the tags appear at the end of line
+      before the optional ``[merge]`` indicator. For line format,
+      the tags appear after the date. (Ian Clatworthy)
+
+    * ``bzr switch`` now takes a ``--revision`` option, to allow switching to a
+      specific revision of a branch. (Daniel Watkins, #183559)
+
+    * Progress bars now show the rate of activity for some sftp 
+      operations, and they are drawn different.  (Martin Pool, #172741)
+
+    * Progress bars now show the rate of activity for urllib and pycurl based
+      http client implementations. The operations are tracked at the socket
+      level for better precision.
+      (Vincent Ladeuil)
+
+    * Rule-based preferences can now accept multiple patterns for a set of
+      rules.  (Marius Kruger)
+
+    * The ``ancestor:`` revision spec will now default to referring to the
+      parent of the branch if no other location is given.
+      (Daniel Watkins, #198417)
+
+    * The debugger started as a result of setting ``$BZR_PDB`` works
+      around a bug in ``pdb``, http://bugs.python.org/issue4150.  The bug
+      can cause truncated tracebacks in Python versions before 2.6.
+      (Andrew Bennetts)
+
+    * VirtualVersionedFiles now implements
+      ``iter_lines_added_or_present_in_keys``. This allows the creation of 
+      new branches based on stacked bzr-svn branches. (#311997)
+
+  BUG FIXES:
+
+    * ``bzr annotate --show-ids`` doesn't give a backtrace on empty files
+      anymore.
+      (Anne Mohsen, Vincent Ladeuil, #314525)
+
+    * ``bzr log FILE`` now correctly shows mainline revisions merging
+      a change to FILE when the ``--short`` and ``--line`` log formats
+      are used. (Ian Clatworthy, #317417)
+
+    * ``bzr log -rX..Y FILE`` now shows the history of FILE provided
+      it existed in Y or X, even if the file has since been deleted or
+      renamed. If no range is given, the current/basis tree and
+      initial tree are searched in that order. More generally, log
+      now interprets filenames in their historical context.
+      (Ian Clatworthy, #175520)
+
+    * ``bzr status`` now reports nonexistent files and continues, then
+       errors (with code 3) at the end.  (Karl Fogel, #306394)
+
+    * Don't require the present compression base in knits to be the same
+      when adding records in knits. (Jelmer Vernooij, #307394)
+
+    * Fix a problem with CIFS client/server lag on Windows colliding with
+      an invariant-per-process algorithm for generating AtomicFile names
+      (Adrian Wilkins, #304023)
+
+    * Many socket operations now handle EINTR by retrying the operation.
+      Previously EINTR was treated as an unrecoverable failure.  There is
+      a new ``until_no_eintr`` helper function in ``bzrlib.osutils``.
+      (Andrew Bennetts)
+
+    * Support symlinks with non-ascii characters in the symlink filename.
+      (Jelmer Vernooij, #319323)
+
+    * There was a bug in how we handled resolving when a file is deleted
+      in one branch, and modified in the other. If there was a criss-cross
+      merge, we would cause the deletion to conflict a second time.
+      (Vincent Ladeuil, John Arbash Meinel)
+
+    * There was another bug in how we chose the correct intermediate LCA in
+      criss-cross merges leading to several kind of changes be incorrectly
+      handled.
+      (John Arbash Meinel, Vincent Ladeuil)
+
+    * Unshelve now handles deleted paths without crashing. (Robert Collins)
+
+  DOCUMENTATION:
+
+    * Improved plugin developer documentation.  (Martin Pool)
+
+  API CHANGES:
+
+    * ``ProgressBarStack`` is deprecated; instead use
+      ``ui_factory.nested_progress_bar`` to create new progress bars.
+
+    * ForeignVcsMapping() now requires a ForeignVcs object as first
+      argument. (Jelmer Vernooij)
+
+    * ForeignVcsMapping.show_foreign_revid() has been moved to
+      ForeignVcs. (Jelmer Vernooij)
+
+    * Revision specifiers are now registered in
+      ``bzrlib.revisionspec.revspec_registry``, and the old list of 
+      revisionspec classes (``bzrlib.revisionspec.SPEC_TYPES``) has been
+      deprecated. (Jelmer Vernooij, #321183)
+
+    * The progress and UI classes have changed; the main APIs remain the
+      same but code that provides a new UI or progress bar class may
+      need to be updated.  (Martin Pool)
+
+  TESTING:
+
+  INTERNALS:
+
+    * Default User Interface (UI) is CLIUIFactory when bzr runs in a dumb
+      terminal. It is sometimes desirable do override this default by forcing
+      bzr to use TextUIFactory. This can be achieved by setting the
+      BZR_USE_TEXT_UI environment variable (emacs shells, as opposed to
+      compile buffers, are such an example).
+      (Vincent Ladeuil)
+
+    * New API ``Branch.iter_merge_sorted_revisions()`` that iterates over
+      ``(revision_id, depth, revno, end_of_merge)`` tuples.
+      (Ian Clatworthy)
+
+    * New ``Branch.dotted_revno_to_revision_id()`` and
+      ``Branch.revision_id_to_dotted_revno()`` APIs that pick the most
+      efficient way of doing the mapping.
+      (Ian Clatworthy)
+
+    * Refactor cmd_serve so that it's a little easier to build commands that
+      extend it, and perhaps even a bit easier to read.  (Jonathan Lange)
+
+    * ``TreeDelta.show()`` now accepts a ``filter`` parameter allowing log
+      formatters to retrict the output.
+      (Vincent Ladeuil)
+
+
+bzr 1.11 "Eyes up!" 2009-01-19
+------------------------------
+>>>>>>> MERGE-SOURCE
 
 This first monthly release of Bazaar for 2009 improves Bazaar's operation
 in Windows, Mac OS X, and other situations where file names are matched

=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	2009-12-23 05:42:33 +0000
+++ bzrlib/builtins.py	2010-01-05 03:39:25 +0000
@@ -5493,22 +5493,42 @@
     that of the master.
     """
 
-    takes_args = ['to_location']
+    takes_args = ['to_location?']
     takes_options = [Option('force',
+<<<<<<< TREE
                         help='Switch even if local commits will be lost.'),
                      Option('create-branch', short_name='b',
                         help='Create the target branch from this one before'
                              ' switching to it.'),
+=======
+                        help='Switch even if local commits will be lost.'),
+                     'revision'
+>>>>>>> MERGE-SOURCE
                      ]
 
+<<<<<<< TREE
     def run(self, to_location, force=False, create_branch=False):
+=======
+    def run(self, to_location=None, force=False, revision=None):
+>>>>>>> MERGE-SOURCE
         from bzrlib import switch
         tree_location = '.'
+        revision = _get_one_revision('switch', revision)
         control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
+<<<<<<< TREE
+=======
+        branch = control_dir.open_branch()
+        if to_location is None:
+            if revision is None:
+                raise errors.BzrCommandError('You must supply either a'
+                                             ' revision or a location')
+            to_location = '.'
+>>>>>>> MERGE-SOURCE
         try:
             branch = control_dir.open_branch()
             had_explicit_nick = branch.get_config().has_explicit_nickname()
         except errors.NotBranchError:
+<<<<<<< TREE
             branch = None
             had_explicit_nick = False
         if create_branch:
@@ -5540,6 +5560,20 @@
                     urlutils.join(this_url, '..', to_location))
         switch.switch(control_dir, to_branch, force)
         if had_explicit_nick:
+=======
+            this_branch = control_dir.open_branch()
+            # This may be a heavy checkout, where we want the master branch
+            this_url = this_branch.get_bound_location()
+            # If not, use a local sibling
+            if this_url is None:
+                this_url = this_branch.base
+            to_branch = Branch.open(
+                urlutils.join(this_url, '..', to_location))
+        if revision is not None:
+            revision = revision.as_revision_id(to_branch)
+        switch.switch(control_dir, to_branch, force, revision)
+        if branch.get_config().has_explicit_nickname():
+>>>>>>> MERGE-SOURCE
             branch = control_dir.open_branch() #get the new branch!
             branch.nick = to_branch.nick
         note('Switched to branch: %s',

=== modified file 'bzrlib/switch.py'
--- bzrlib/switch.py	2009-06-19 21:16:31 +0000
+++ bzrlib/switch.py	2010-01-05 03:39:25 +0000
@@ -22,7 +22,11 @@
 from bzrlib.trace import note
 
 
+<<<<<<< TREE
 def switch(control_dir, to_branch, force=False, quiet=False):
+=======
+def switch(control_dir, to_branch, force=False, revision_id=None):
+>>>>>>> MERGE-SOURCE
     """Switch the branch associated with a checkout.
 
     :param control_dir: BzrDir of the checkout to change
@@ -36,7 +40,11 @@
         source_repository = to_branch.repository
     _set_branch_location(control_dir, to_branch, force)
     tree = control_dir.open_workingtree()
+<<<<<<< TREE
     _update(tree, source_repository, quiet)
+=======
+    _update(tree, source_repository, revision_id)
+>>>>>>> MERGE-SOURCE
 
 
 def _check_pending_merges(control, force=False):
@@ -118,7 +126,11 @@
     return False
 
 
+<<<<<<< TREE
 def _update(tree, source_repository, quiet=False):
+=======
+def _update(tree, source_repository, revision_id=None):
+>>>>>>> MERGE-SOURCE
     """Update a working tree to the latest revision of its branch.
 
     :param tree: the working tree
@@ -127,14 +139,27 @@
     tree.lock_tree_write()
     try:
         to_branch = tree.branch
+<<<<<<< TREE
         if tree.last_revision() == to_branch.last_revision():
             if not quiet:
                 note("Tree is up to date at revision %d.", to_branch.revno())
+=======
+        if revision_id is None:
+            revision_id = to_branch.last_revision()
+        if tree.last_revision() == revision_id:
+            note("Tree is up to date at revision %d.", to_branch.revno())
+>>>>>>> MERGE-SOURCE
             return
         base_tree = source_repository.revision_tree(tree.last_revision())
+<<<<<<< TREE
         merge.Merge3Merger(tree, tree, base_tree, to_branch.basis_tree())
         tree.set_last_revision(to_branch.last_revision())
         if not quiet:
             note('Updated to revision %d.' % to_branch.revno())
+=======
+        merge.Merge3Merger(tree, tree, base_tree, to_branch.repository.revision_tree(revision_id))
+        tree.set_last_revision(revision_id)
+        note('Updated to revision %d.' % to_branch.revno())
+>>>>>>> MERGE-SOURCE
     finally:
         tree.unlock()

=== modified file 'bzrlib/tests/blackbox/test_switch.py'
--- bzrlib/tests/blackbox/test_switch.py	2009-12-11 17:04:09 +0000
+++ bzrlib/tests/blackbox/test_switch.py	2010-01-05 03:39:25 +0000
@@ -27,6 +27,15 @@
 
 class TestSwitch(ExternalBase):
 
+    def _create_sample_tree(self):
+        tree = self.make_branch_and_tree('branch-1')
+        self.build_tree(['branch-1/file-1', 'branch-1/file-2'])
+        tree.add('file-1')
+        tree.commit('rev1')
+        tree.add('file-2')
+        tree.commit('rev2')
+        return tree
+
     def test_switch_up_to_date_light_checkout(self):
         self.make_branch_and_tree('branch')
         self.run_bzr('branch branch branch2')
@@ -134,6 +143,7 @@
         self.run_bzr(['switch', 'branchb'], working_dir='heavyco/a')
         self.assertEqual(branchb_id, checkout.last_revision())
         self.assertEqual(tree2.branch.base, checkout.branch.get_bound_location())
+<<<<<<< TREE
 
     def prepare_lightweight_switch(self):
         branch = self.make_branch('branch')
@@ -197,3 +207,25 @@
         tree = WorkingTree.open('tree')
         self.assertEndsWith(tree.branch.base, 'foo-branch2/')
 
+=======
+
+    def test_switch_revision(self):
+        tree = self._create_sample_tree()
+        checkout = tree.branch.create_checkout('checkout', lightweight=True)
+        self.run_bzr(['switch', 'branch-1', '-r1'], working_dir='checkout')
+        self.failUnlessExists('checkout/file-1')
+        self.failIfExists('checkout/file-2')
+
+    def test_switch_only_revision(self):
+        tree = self._create_sample_tree()
+        checkout = tree.branch.create_checkout('checkout', lightweight=True)
+        self.failUnlessExists('checkout/file-1')
+        self.failUnlessExists('checkout/file-2')
+        self.run_bzr(['switch', '-r1'], working_dir='checkout')
+        self.failUnlessExists('checkout/file-1')
+        self.failIfExists('checkout/file-2')
+        # Check that we don't accept a range
+        self.run_bzr_error(
+            ['bzr switch --revision takes exactly one revision identifier'],
+            ['switch', '-r0..2'], working_dir='checkout')
+>>>>>>> MERGE-SOURCE

=== modified file 'bzrlib/tests/test_switch.py'
--- bzrlib/tests/test_switch.py	2009-05-07 05:08:46 +0000
+++ bzrlib/tests/test_switch.py	2010-01-05 03:39:25 +0000
@@ -100,6 +100,23 @@
         self.assertContainsRe(str(err),
             "Pending merges must be committed or reverted before using switch")
 
+    def test_switch_with_revision(self):
+        """Test switch when a revision is given."""
+        # Create a tree with 2 revisions
+        tree = self.make_branch_and_tree('branch-1')
+        self.build_tree(['branch-1/file-1'])
+        tree.add('file-1')
+        tree.commit(rev_id='rev1', message='rev1')
+        self.build_tree(['branch-1/file-2'])
+        tree.add('file-2')
+        tree.commit(rev_id='rev2', message='rev2')
+        # Check it out and switch to revision 1
+        checkout = tree.branch.create_checkout('checkout',
+                                               lightweight=self.lightweight)
+        switch.switch(checkout.bzrdir, tree.branch, revision_id="rev1")
+        self.failUnlessExists('checkout/file-1')
+        self.failIfExists('checkout/file-2')
+
 
 class TestSwitchHeavyweight(TestSwitch):