##// END OF EJS Templates
Fix empty pull bug that appeared this morning...
mpm@selenic.com -
r522:2f1de824 default
parent child Browse files
Show More
@@ -302,8 +302,9 b' def clone(ui, source, dest = None, **opt'
302 repo = hg.repository(ui, ".", create=1)
302 repo = hg.repository(ui, ".", create=1)
303 other = hg.repository(ui, source)
303 other = hg.repository(ui, source)
304 fetch = repo.findincoming(other)
304 fetch = repo.findincoming(other)
305 cg = other.changegroup(fetch)
305 if fetch:
306 repo.addchangegroup(cg)
306 cg = other.changegroup(fetch)
307 repo.addchangegroup(cg)
307
308
308 f = repo.opener("hgrc", "w")
309 f = repo.opener("hgrc", "w")
309 f.write("[paths]\n")
310 f.write("[paths]\n")
@@ -549,6 +550,10 b' def pull(ui, repo, source="default", **o'
549
550
550 other = hg.repository(ui, source)
551 other = hg.repository(ui, source)
551 fetch = repo.findincoming(other)
552 fetch = repo.findincoming(other)
553 if not fetch:
554 ui.status("no changes found\n")
555 return
556
552 cg = other.changegroup(fetch)
557 cg = other.changegroup(fetch)
553 r = repo.addchangegroup(cg)
558 r = repo.addchangegroup(cg)
554 if cg and not r:
559 if cg and not r:
@@ -841,7 +841,6 b' class localrepository:'
841 unknown.append(h)
841 unknown.append(h)
842
842
843 if not unknown:
843 if not unknown:
844 self.ui.status("nothing to do!\n")
845 return None
844 return None
846
845
847 rep = {}
846 rep = {}
@@ -16,5 +16,6 b' hg verify'
16 hg co
16 hg co
17 cat foo
17 cat foo
18 hg manifest
18 hg manifest
19 hg pull
19
20
20 kill $!
21 kill $!
@@ -15,4 +15,7 b' checking files'
15 1 files, 1 changesets, 1 total revisions
15 1 files, 1 changesets, 1 total revisions
16 foo
16 foo
17 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo
17 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo
18 pulling from http://localhost:20059/
19 searching for changes
20 no changes found
18 killed!
21 killed!
General Comments 0
You need to be logged in to leave comments. Login now