Dan Villiom Podlaski Christiansen avatar Dan Villiom Podlaski Christiansen committed 2b6edd2

Rebased.

Comments (0)

Files changed (14)

allow-multi-rebuildmeta.diff

 # HG changeset patch
 # User Dan Villiom Podlaski Christiansen <dan@cabo.dk>
 # Date 1323817677 -3600
-# Node ID 217c33a9a231e593f71d81826bb197b985e181a1
-# Parent  a7c44a202dd85d18ae6c9fe5c4a070a98bd6c306
+# Node ID bfba4f40b62cdcde7a9cd7895b2942eab57fb750
+# Parent  7ac002d36732a3cf80f0f92cea432ef583a19ed5
 rebuildmeta: handle revisions from other repositories gracefully
 
 Previously, such revisions would cause 'hg svn rebuildmeta' to fail

assert-rebuildmeta.diff

 # HG changeset patch
 # User Dan Villiom Podlaski Christiansen <danchr@gmail.com>
 # Date 1323817677 -3600
-# Node ID 914c6cd268eeb93431cc58b3cdc0fce5b18e9076
-# Parent  3545e97c478dbb6c7b1ccb5b4342baa825a50fce
+# Node ID 84bf8ace2e417a61dd0efbb6b1a374bab31a6ac9
+# Parent  c987b32c6c6627ace7f169120844bf9bfd6807fd
 rebuildmeta: assert that .hgtags is append-only
 
 The code followed by the assertion assumes that tags are always
 # HG changeset patch
 # User Dan Villiom Podlaski Christiansen  <danchr@gmail.com>
 # Date 1323817677 -3600
-# Node ID a7c44a202dd85d18ae6c9fe5c4a070a98bd6c306
-# Parent  1324f166c9db1212c85115423a5cd5f52432740f
+# Node ID 7ac002d36732a3cf80f0f92cea432ef583a19ed5
+# Parent  6b969673ca25c13f47117a9c5a0f4c9c9d9feedd
 expand configured paths
 
 diff --git a/hgsubversion/svnmeta.py b/hgsubversion/svnmeta.py
 --- a/hgsubversion/svnmeta.py
 +++ b/hgsubversion/svnmeta.py
-@@ -43,13 +43,13 @@ class SVNMeta(object):
+@@ -48,13 +48,13 @@ class SVNMeta(object):
          self.revmap = maps.RevMap(repo)
  
          author_host = self.ui.config('hgsubversion', 'defaulthost', uuid)

drop-unused-flags.diff

 # HG changeset patch
 # User Dan Villiom Podlaski Christiansen <danchr@gmail.com>
 # Date 1323817677 -3600
-# Node ID 3545e97c478dbb6c7b1ccb5b4342baa825a50fce
-# Parent  6c8dbf255a7093f82707ad27a1fea26389c483af
+# Node ID c987b32c6c6627ace7f169120844bf9bfd6807fd
+# Parent  ab9afeb2e13be389c49cfaf1c7ebbd2a2fcf5ee9
 svn: drop unused options
 
 The -u/--svn-url and --filemap options are currently unused: The
 # HG changeset patch
 # User Dan Villiom Podlaski Christiansen <danchr@gmail.com>
 # Date 1323817677 -3600
-# Node ID fb953ea52437bf9d0b3fd826642a267399aafc3a
-# Parent  ab674f6608088ee8724632a8d9e61f352d846c02
+# Node ID 331d81952b556297cf3aec5c0a6b1cd3e6301c29
+# Parent  1c10e9fd30805c11f9679fbafb237a50b576d31e
 Allow empty branch creation.
 
 diff --git a/hgsubversion/replay.py b/hgsubversion/replay.py
 # HG changeset patch
 # User Dan Villiom Podlaski Christiansen <dan@cabo.dk>
 # Date 1323817677 -3600
-# Node ID dff88f3239468cd777f20f9d8850ee15cdb43a14
-# Parent  a279b5838aaf4ddcdb18aa09dbe573e68c339a02
+# Node ID a2c6380cd301e741d3ad4b2203f5fb7867d439ce
+# Parent  055f9254d790c8972abc96c84a4bae3c454aee8f
 svnmeta: only remove directory components in normalize()
 
 Previously, a file beginning with the repository subdirectory would be
 diff --git a/hgsubversion/svnmeta.py b/hgsubversion/svnmeta.py
 --- a/hgsubversion/svnmeta.py
 +++ b/hgsubversion/svnmeta.py
-@@ -287,7 +287,9 @@ class SVNMeta(object):
+@@ -292,7 +292,9 @@ class SVNMeta(object):
              return ''
          if path and path[0] == '/':
              path = path[1:]
 diff --git a/tests/test_util.py b/tests/test_util.py
 --- a/tests/test_util.py
 +++ b/tests/test_util.py
-@@ -97,6 +97,7 @@ subdir = {'truncatedhistory.svndump': '/
+@@ -96,6 +96,7 @@ subdir = {'truncatedhistory.svndump': '/
            'project_name_with_space.svndump': '/project name',
            'non_ascii_path_1.svndump': '/b\xC3\xB8b',
            'non_ascii_path_2.svndump': '/b%C3%B8b',
 # HG changeset patch
 # User Dan Villiom Podlaski Christiansen <danchr@gmail.com>
 # Date 1323817677 -3600
-# Node ID ab674f6608088ee8724632a8d9e61f352d846c02
-# Parent  217c33a9a231e593f71d81826bb197b985e181a1
+# Node ID 1c10e9fd30805c11f9679fbafb237a50b576d31e
+# Parent  bfba4f40b62cdcde7a9cd7895b2942eab57fb750
 tests: set HGRCPATH to disable user configuration
 
-diff --git a/Makefile b/Makefile
---- a/Makefile
-+++ b/Makefile
-@@ -17,11 +17,11 @@ check: check-demandimport check-subvertp
- check-demandimport:
- 	# verify that hgsubversion loads properly without bindings, but fails
- 	# when actually used
--	! LC_ALL=C HGSUBVERSION_BINDINGS=none \
-+	! LC_ALL=C HGRCPATH=/dev/null HGSUBVERSION_BINDINGS=none\
- 	  hg --config extensions.hgsubversion=./hgsubversion \
- 	  version 2>&1 \
- 	  | egrep '(^abort:|failed to import extension)'
--	LC_ALL=C HGSUBVERSION_BINDINGS=none \
-+	LC_ALL=C HGRCPATH=/dev/null HGSUBVERSION_BINDINGS=none \
- 	  hg --config extensions.hgsubversion=./hgsubversion \
- 	  version --svn 2>&1 \
- 	  | egrep '(^abort:|failed to import extension)'
 diff --git a/tests/run.py b/tests/run.py
 --- a/tests/run.py
 +++ b/tests/run.py
-verify-branchurl.diff
-test-hgrcpath.diff
 fix-prefix.diff
 verify-test.diff
 verify-editor.diff

subvertpy-version.diff

 # HG changeset patch
 # User Dan Villiom Podlaski Christiansen <danchr@gmail.com>
 # Date 1323817678 -3600
-# Node ID 15be85b80b658e1ca3e00b9e6935cbd07a9ed510
-# Parent  914c6cd268eeb93431cc58b3cdc0fce5b18e9076
+# Node ID 31c7991dcfd56b06500e0c2beee88693ade37715
+# Parent  84bf8ace2e417a61dd0efbb6b1a374bab31a6ac9
 subvertpy wrapper: show currently used version
 
 Always display the currently linked version of the Subversion
 # HG changeset patch
 # User Dan Villiom Podlaski Christiansen <danchr@gmail.com>
 # Date 1323817677 -3600
-# Node ID 6c8dbf255a7093f82707ad27a1fea26389c483af
-# Parent  fb953ea52437bf9d0b3fd826642a267399aafc3a
+# Node ID ab9afeb2e13be389c49cfaf1c7ebbd2a2fcf5ee9
+# Parent  331d81952b556297cf3aec5c0a6b1cd3e6301c29
 tests: hexadecimal hashes are more readable than their binary brethren
 
 diff --git a/tests/comprehensive/test_stupid_pull.py b/tests/comprehensive/test_stupid_pull.py

test-hgrcpath.diff

-# HG changeset patch
-# Parent 0b5a889075dd56ba2c5faa0507b0cf796be10d7a
-# User Dan Villiom Podlaski Christiansen  <danchr@gmail.com>
-Makefile: set HGRCPATH to protects us from broken environments
-
-diff --git a/Makefile b/Makefile
---- a/Makefile
-+++ b/Makefile
-@@ -17,11 +17,11 @@ check: check-demandimport check-subvertp
- check-demandimport:
- 	# verify that hgsubversion loads properly without bindings, but fails
- 	# when actually used
--	! LC_ALL=C HGSUBVERSION_BINDINGS=none \
-+	! LC_ALL=C HGSUBVERSION_BINDINGS=none HGRCPATH=/dev/null \
- 	  hg --config extensions.hgsubversion=./hgsubversion \
- 	  version 2>&1 \
- 	  | egrep '(^abort:|failed to import extension)'
--	LC_ALL=C HGSUBVERSION_BINDINGS=none \
-+	LC_ALL=C HGSUBVERSION_BINDINGS=none HGRCPATH=/dev/null \
- 	  hg --config extensions.hgsubversion=./hgsubversion \
- 	  version --svn 2>&1 \
- 	  | egrep '(^abort:|failed to import extension)'

verify-branchurl.diff

-# HG changeset patch
-# User Dan Villiom Podlaski Christiansen <danchr@gmail.com>
-# Date 1323817678 -3600
-# Node ID b8868f589d2f29ec2b0b1c859c5a971055840ff0
-# Parent  dff88f3239468cd777f20f9d8850ee15cdb43a14
-svn verify: mention URL in output
-
-Before:
-
-verifying 9b763e4870f5 against r72
-
-After:
-
-verifying 9b763e4870f5 against http://gclient.googlecode.com/svn/trunk@72
-
-diff --git a/hgsubversion/svncommands.py b/hgsubversion/svncommands.py
---- a/hgsubversion/svncommands.py
-+++ b/hgsubversion/svncommands.py
-@@ -43,8 +43,9 @@ def verify(ui, repo, args=None, **opts):
-     srev, branch, branchpath = meta.get_source_rev(ctx=ctx)
- 
-     branchpath = branchpath[len(svn.subdir.lstrip('/')):]
-+    branchurl = ('%s/%s' % (url, branchpath)).strip('/')
- 
--    ui.write('verifying %s against r%i\n' % (ctx, srev))
-+    ui.write('verifying %s against %s@%i\n' % (ctx, branchurl, srev))
- 
-     svnfiles = set()
-     result = 0

verify-editor.diff

 # HG changeset patch
 # User Dan Villiom Podlaski Christiansen <danchr@gmail.com>
 # Date 1323817678 -3600
-# Node ID 1324f166c9db1212c85115423a5cd5f52432740f
-# Parent 554fd70ca17e0f67bc449619730c48b59470eb04
+# Node ID 6b969673ca25c13f47117a9c5a0f4c9c9d9feedd
+# Parent  0cc046e3b3af81cda55617c59573b9d5b51a27e1
 svn verify: use a custom editor and get_revision()
 
 Previously, we would fetch each file in the revision/changeset
 # HG changeset patch
 # User Dan Villiom Podlaski Christiansen <danchr@gmail.com>
 # Date 1323817678 -3600
-# Node ID 1e3a46748d791d74fa489bab8eef935fd607a5fb
-# Parent 727cb50993d5a7195a1441724fa25fc5229a3ec4
+# Node ID 0cc046e3b3af81cda55617c59573b9d5b51a27e1
+# Parent  a2c6380cd301e741d3ad4b2203f5fb7867d439ce
 svn verify: add a test for corrupt repositories.
 
 This case contains a couple of unlikely (but not impossible) failure
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.