Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
authorMartin Geisler <mg@lazybytes.net>
Wed, 16 Mar 2011 16:07:06 +0100
changeset 13659 a73f38d8bbdb
parent 13656 0e200e1801f4 (current diff)
parent 13658 6cc306093b99 (diff)
child 13660 a56c1b2bff18
merge with stable
hgext/relink.py file | annotate | diff | comparison | revisions
tests/test-relink.t file | annotate | diff | comparison | revisions 
--- a/hgext/relink.py	Wed Mar 16 13:51:47 2011 +0100
+++ b/hgext/relink.py	Wed Mar 16 16:07:06 2011 +0100
@@ -42,8 +42,12 @@
         hg.remoteui(repo, opts),
         ui.expandpath(origin or 'default-relink', origin or 'default'))
     if not src.local():
-        raise util.Abort('must specify local origin repository')
+        raise util.Abort(_('must specify local origin repository'))
     ui.status(_('relinking %s to %s\n') % (src.store.path, repo.store.path))
+    if repo.root == src.root:
+        ui.status(_('there is nothing to relink\n'))
+        return
+
     locallock = repo.lock()
     try:
         remotelock = src.lock()
--- a/tests/test-relink.t	Wed Mar 16 13:51:47 2011 +0100
+++ b/tests/test-relink.t	Wed Mar 16 16:07:06 2011 +0100
@@ -36,6 +36,13 @@
   $ cat $TESTDIR/binfile.bin >> b
   $ hg ci -m anotherchange
 
+don't sit forever trying to double-lock the source repo
+
+  $ hg relink .
+  relinking $TESTTMP/repo/.hg/store to $TESTTMP/repo/.hg/store
+  there is nothing to relink
+
+
 Test files are read in binary mode
 
   $ python -c "file('.hg/store/data/dummy.i', 'wb').write('a\r\nb\n')"
mercurial