##// END OF EJS Templates
pull: allow to pull from bundle file without need for bundle: syntax
Vadim Gelfer -
r2738:400a4a50 default
parent child Browse files
Show More
@@ -31,6 +31,8 b' def hg(ui, path):'
31 def local_(ui, path, create=0):
31 def local_(ui, path, create=0):
32 if path.startswith('file:'):
32 if path.startswith('file:'):
33 path = path[5:]
33 path = path[5:]
34 if not create and os.path.isfile(path):
35 return bundlerepo.bundlerepository(ui, '', path)
34 return localrepo.localrepository(ui, path, create)
36 return localrepo.localrepository(ui, path, create)
35
37
36 def ssh_(ui, path, create=0):
38 def ssh_(ui, path, create=0):
@@ -30,10 +30,14 b' cd ..'
30 hg init empty
30 hg init empty
31 hg -R test bundle full.hg empty
31 hg -R test bundle full.hg empty
32 hg -R test unbundle full.hg
32 hg -R test unbundle full.hg
33 hg -R empty unbundle full.hg
34 hg -R empty heads
33 hg -R empty heads
35 hg -R empty verify
34 hg -R empty verify
36
35
36 hg --cwd test pull ../full.hg
37 hg --cwd empty pull ../full.hg
38 hg -R empty rollback
39 hg --cwd empty pull ../full.hg
40
37 rm -rf empty
41 rm -rf empty
38 hg init empty
42 hg init empty
39 cd empty
43 cd empty
@@ -11,28 +11,34 b' adding manifests'
11 adding file changes
11 adding file changes
12 added 0 changesets with 0 changes to 4 files
12 added 0 changesets with 0 changes to 4 files
13 (run 'hg update' to get a working copy)
13 (run 'hg update' to get a working copy)
14 changeset: -1:000000000000
15 tag: tip
16 user:
17 date: Thu Jan 01 00:00:00 1970 +0000
18
19 checking changesets
20 checking manifests
21 crosschecking files in changesets and manifests
22 checking files
23 0 files, 0 changesets, 0 total revisions
24 pulling from ../full.hg
25 searching for changes
26 no changes found
27 pulling from ../full.hg
28 requesting all changes
14 adding changesets
29 adding changesets
15 adding manifests
30 adding manifests
16 adding file changes
31 adding file changes
17 added 9 changesets with 7 changes to 4 files (+1 heads)
32 added 9 changesets with 7 changes to 4 files (+1 heads)
18 (run 'hg heads' to see heads, 'hg merge' to merge)
33 (run 'hg heads' to see heads, 'hg merge' to merge)
19 changeset: 8:836ac62537ab
34 rolling back last transaction
20 tag: tip
35 pulling from ../full.hg
21 parent: 3:ac69c658229d
36 requesting all changes
22 user: test
37 adding changesets
23 date: Mon Jan 12 13:46:40 1970 +0000
38 adding manifests
24 summary: 0.3m
39 adding file changes
25
40 added 9 changesets with 7 changes to 4 files (+1 heads)
26 changeset: 7:80fe151401c2
41 (run 'hg heads' to see heads, 'hg merge' to merge)
27 user: test
28 date: Mon Jan 12 13:46:40 1970 +0000
29 summary: 1.3m
30
31 checking changesets
32 checking manifests
33 crosschecking files in changesets and manifests
34 checking files
35 4 files, 9 changesets, 7 total revisions
36 changeset: 8:836ac62537ab
42 changeset: 8:836ac62537ab
37 tag: tip
43 tag: tip
38 parent: 3:ac69c658229d
44 parent: 3:ac69c658229d
General Comments 0
You need to be logged in to leave comments. Login now