Show More
@@ -4605,8 +4605,10 b' def pull(ui, repo, source="default", **o' | |||
|
4605 | 4605 | """ |
|
4606 | 4606 | source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) |
|
4607 | 4607 | other = hg.peer(repo, opts, source) |
|
4608 | try: | |
|
4608 | 4609 | ui.status(_('pulling from %s\n') % util.hidepassword(source)) |
|
4609 |
revs, checkout = hg.addbranchrevs(repo, other, branches, |
|
|
4610 | revs, checkout = hg.addbranchrevs(repo, other, branches, | |
|
4611 | opts.get('rev')) | |
|
4610 | 4612 | |
|
4611 | 4613 | remotebookmarks = other.listkeys('bookmarks') |
|
4612 | 4614 | |
@@ -4645,7 +4647,8 b' def pull(ui, repo, source="default", **o' | |||
|
4645 | 4647 | ui.status(_("importing bookmark %s\n") % b) |
|
4646 | 4648 | marks[b] = repo[remotebookmarks[b]].node() |
|
4647 | 4649 | marks.write() |
|
4648 | ||
|
4650 | finally: | |
|
4651 | other.close() | |
|
4649 | 4652 | return ret |
|
4650 | 4653 | |
|
4651 | 4654 | @command('^push', |
@@ -84,6 +84,11 b' Pull full.hg into test (using --cwd)' | |||
|
84 | 84 | searching for changes |
|
85 | 85 | no changes found |
|
86 | 86 | |
|
87 | Verify that there are no leaked temporary files after pull (issue2797) | |
|
88 | ||
|
89 | $ ls test/.hg | grep .hg10un | |
|
90 | [1] | |
|
91 | ||
|
87 | 92 | Pull full.hg into empty (using --cwd) |
|
88 | 93 | |
|
89 | 94 | $ hg --cwd empty pull ../full.hg |
General Comments 0
You need to be logged in to leave comments.
Login now