Merge lp:~gagern/trac-bzr/bug274609 into lp:trac-bzr

[Martin von Gagern]

[Martin von Gagern (gagern)]

I'd like this function cleaned before I start more serious modifications on it.

[lp:~gagern/trac-bzr/bug274609]

71. By Martin von Gagern on 2009-11-24

Warn if dotted revno gets interpreted as revid.

=== modified file 'tracbzr/backend.py'
--- tracbzr/backend.py	2009-11-24 17:48:54 +0000
+++ tracbzr/backend.py	2009-11-24 17:54:09 +0000
@@ -254,7 +254,7 @@
             except errors.NotBranchError:
                 raise versioncontrol.NoSuchChangeset(rev)
 
-            if len(split) == 2:
+            if rev_rev:
                 if rev_rev.isdigit():
                     try:
                         revid = branch.get_rev_id(int(rev_rev))
@@ -270,7 +270,7 @@
                         cache = self.get_branch_cache(branch)
                         revid = cache.revid_from_dotted(rev_rev)
                         if revid is None:
-                            raise repr(dotted)
+                            self.log.warn('%r is no dotted revno, will interpret as revid.', rev_rev)
                             revid = urllib.unquote(rev_rev)
             else:
                 revid = branch.last_revision()
@@ -282,11 +282,6 @@
         if revid in (CURRENT_REVISION, NULL_REVISION):
             return None, revid
         return None, revid
-        if self.repo.has_revision(revid):
-            return None, revid
-
-        # Unsupported format.
-        raise versioncontrol.NoSuchChangeset(rev)
 
     # Trac api methods.