Rev 2753: (Lukas Lalinsky) Accept ..\ as a path in revision specifiers. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Tue Aug 28 04:56:40 BST 2007


At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2753
revision-id: pqm at pqm.ubuntu.com-20070828035639-q7qmg7gafaevlvku
parent: pqm at pqm.ubuntu.com-20070828032606-yp46hkvcaan2ew9b
parent: lalinsky at gmail.com-20070825181108-0nvdwx57n3qatub0
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-08-28 04:56:39 +0100
message:
  (Lukas Lalinsky) Accept ..\ as a path in revision specifiers.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
    ------------------------------------------------------------
    revno: 2747.1.1
    merged: lalinsky at gmail.com-20070825181108-0nvdwx57n3qatub0
    parent: pqm at pqm.ubuntu.com-20070824133750-r25v5g25g1flggy6
    committer: Lukáš Lalinský <lalinsky at gmail.com>
    branch nick: revspec
    timestamp: Sat 2007-08-25 11:11:08 -0700
    message:
      Accept ..\ as a path in revision specifiers
=== modified file 'NEWS'
--- a/NEWS	2007-08-28 00:49:10 +0000
+++ b/NEWS	2007-08-28 03:56:39 +0000
@@ -36,6 +36,9 @@
     * patch verification for merge directives is reactivated, and works with
       CRLF and CR files.  (Aaron Bentley)
 
+    * Accept ..\ as a path in revision specifiers. This fixes for example
+      "-r branch:..\other-branch" on Windows.  (Lukáš Lalinský) 
+
   IMPROVEMENTS:
 
     * ``pull`` and ``merge`` are much faster at installing bundle format 4.

=== modified file 'bzrlib/option.py'
--- a/bzrlib/option.py	2007-08-09 05:16:53 +0000
+++ b/bzrlib/option.py	2007-08-25 18:11:08 +0000
@@ -86,11 +86,15 @@
     [<RevisionSpec_branch branch:../../branch2>]
     >>> _parse_revision_str('branch:../../branch2..23')
     [<RevisionSpec_branch branch:../../branch2>, <RevisionSpec_revno 23>]
+    >>> _parse_revision_str('branch:..\\\\branch2')
+    [<RevisionSpec_branch branch:..\\branch2>]
+    >>> _parse_revision_str('branch:..\\\\..\\\\branch2..23')
+    [<RevisionSpec_branch branch:..\\..\\branch2>, <RevisionSpec_revno 23>]
     """
     # TODO: Maybe move this into revisionspec.py
     revs = []
-    # split on the first .. that is not followed by a / ?
-    sep = re.compile("\\.\\.(?!/)")
+    # split on .. that is not followed by a / or \
+    sep = re.compile(r'\.\.(?![\\/])')
     for x in sep.split(revstr):
         revs.append(revisionspec.RevisionSpec.from_string(x or None))
     return revs




More information about the bazaar-commits mailing list