Show More
@@ -13,3 +13,4 b' 11a4eb81fb4f4742451591489e2797dc47903277' | |||
|
13 | 13 | 11efa41037e280d08cfb07c09ad485df30fb0ea8 0 iEYEABECAAYFAkmvJRQACgkQywK+sNU5EO9XZwCeLMgDgPSMWMm6vgjL4lDs2pEc5+0AnRxfiFbpbBfuEFTqKz9nbzeyoBlx |
|
14 | 14 | 02981000012e3adf40c4849bd7b3d5618f9ce82d 0 iEYEABECAAYFAknEH3wACgkQywK+sNU5EO+uXwCeI+LbLMmhjU1lKSfU3UWJHjjUC7oAoIZLvYDGOL/tNZFUuatc3RnZ2eje |
|
15 | 15 | 196d40e7c885fa6e95f89134809b3ec7bdbca34b 0 iEYEABECAAYFAkpL2X4ACgkQywK+sNU5EO9FOwCfXJycjyKJXsvQqKkHrglwOQhEKS4An36GfKzptfN8b1qNc3+ya/5c2WOM |
|
16 | 3ef6c14a1e8e83a31226f5881b7fe6095bbfa6f6 0 iEYEABECAAYFAkpopLIACgkQywK+sNU5EO8QSgCfZ0ztsd071rOa2lhmp9Fyue/WoI0AoLTei80/xrhRlB8L/rZEf2KBl8dA |
@@ -25,3 +25,4 b' 11a4eb81fb4f4742451591489e2797dc47903277' | |||
|
25 | 25 | 11efa41037e280d08cfb07c09ad485df30fb0ea8 1.2 |
|
26 | 26 | 02981000012e3adf40c4849bd7b3d5618f9ce82d 1.2.1 |
|
27 | 27 | 196d40e7c885fa6e95f89134809b3ec7bdbca34b 1.3 |
|
28 | 3ef6c14a1e8e83a31226f5881b7fe6095bbfa6f6 1.3.1 |
@@ -127,8 +127,7 b" def fetch(ui, repo, source='default', **" | |||
|
127 | 127 | editor = cmdutil.commiteditor |
|
128 | 128 | if opts.get('force_editor') or opts.get('edit'): |
|
129 | 129 | editor = cmdutil.commitforceeditor |
|
130 | n = repo.commit(message, opts['user'], opts['date'], | |
|
131 | force=True, editor=editor) | |
|
130 | n = repo.commit(message, opts['user'], opts['date'], editor=editor) | |
|
132 | 131 | ui.status(_('new changeset %d:%s merges remote changes ' |
|
133 | 132 | 'with local\n') % (repo.changelog.rev(n), |
|
134 | 133 | short(n))) |
@@ -528,7 +528,7 b' cmdtable = {' | |||
|
528 | 528 | 'kwdemo': |
|
529 | 529 | (demo, |
|
530 | 530 | [('d', 'default', None, _('show default keyword template maps')), |
|
531 |
('f', 'rcfile', |
|
|
531 | ('f', 'rcfile', '', _('read maps from rcfile'))], | |
|
532 | 532 | _('hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]...')), |
|
533 | 533 | 'kwexpand': (expand, commands.walkopts, |
|
534 | 534 | _('hg kwexpand [OPTION]... [FILE]...')), |
@@ -1359,6 +1359,8 b' def heads(ui, repo, *branchrevs, **opts)' | |||
|
1359 | 1359 | closed = opts.get('closed') |
|
1360 | 1360 | hideinactive, _heads = opts.get('active'), None |
|
1361 | 1361 | if not branchrevs: |
|
1362 | if closed: | |
|
1363 | raise error.Abort(_('you must specify a branch to use --closed')) | |
|
1362 | 1364 | # Assume we're looking repo-wide heads if no revs were specified. |
|
1363 | 1365 | heads = repo.heads(start) |
|
1364 | 1366 | else: |
@@ -3013,7 +3015,7 b' def update(ui, repo, node=None, rev=None' | |||
|
3013 | 3015 | raise util.Abort(_("you can't specify a revision and a date")) |
|
3014 | 3016 | rev = cmdutil.finddate(ui, repo, date) |
|
3015 | 3017 | |
|
3016 | if clean: | |
|
3018 | if clean or check: | |
|
3017 | 3019 | return hg.clean(repo, rev) |
|
3018 | 3020 | else: |
|
3019 | 3021 | return hg.update(repo, rev) |
@@ -3175,7 +3177,7 b' table = {' | |||
|
3175 | 3177 | [('a', 'active', False, |
|
3176 | 3178 | _('show only branches that have unmerged heads')), |
|
3177 | 3179 | ('c', 'closed', False, |
|
3178 |
_('show normal and closed he |
|
|
3180 | _('show normal and closed branches'))], | |
|
3179 | 3181 | _('[-a]')), |
|
3180 | 3182 | "bundle": |
|
3181 | 3183 | (bundle, |
@@ -3292,9 +3294,9 b' table = {' | |||
|
3292 | 3294 | (heads, |
|
3293 | 3295 | [('r', 'rev', '', _('show only heads which are descendants of REV')), |
|
3294 | 3296 | ('a', 'active', False, |
|
3295 | _('show only the active heads from open branches')), | |
|
3297 | _('show only the active branch heads from open branches')), | |
|
3296 | 3298 | ('c', 'closed', False, |
|
3297 | _('show normal and closed heads')), | |
|
3299 | _('show normal and closed branch heads')), | |
|
3298 | 3300 | ] + templateopts, |
|
3299 | 3301 | _('[-r STARTREV] [REV]...')), |
|
3300 | 3302 | "help": (help_, [], _('[TOPIC]')), |
@@ -107,7 +107,12 b' def _abssource(repo, push=False):' | |||
|
107 | 107 | source = repo._subsource |
|
108 | 108 | if source.startswith('/') or '://' in source: |
|
109 | 109 | return source |
|
110 |
re |
|
|
110 | parent = _abssource(repo._subparent) | |
|
111 | if '://' in parent: | |
|
112 | if parent[-1] == '/': | |
|
113 | parent = parent[:-1] | |
|
114 | return parent + '/' + source | |
|
115 | return os.path.join(parent, repo._subsource) | |
|
111 | 116 | if push and repo.ui.config('paths', 'default-push'): |
|
112 | 117 | return repo.ui.config('paths', 'default-push', repo.root) |
|
113 | 118 | return repo.ui.config('paths', 'default', repo.root) |
@@ -63,26 +63,7 b' a branch name much longer than the defau' | |||
|
63 | 63 | c 6:589736a22561 (inactive) |
|
64 | 64 | a 5:d8cbc61dbaa6 (inactive) |
|
65 | 65 | default 0:19709c5a4e75 (inactive) |
|
66 | changeset: 10:bfbe841b666e | |
|
67 | branch: b | |
|
68 | tag: tip | |
|
69 | user: test | |
|
70 | date: Thu Jan 01 00:00:09 1970 +0000 | |
|
71 | summary: adding another cset to branch b | |
|
72 | ||
|
73 | changeset: 8:eebb944467c9 | |
|
74 | branch: b | |
|
75 | parent: 4:aee39cd168d0 | |
|
76 | user: test | |
|
77 | date: Thu Jan 01 00:00:07 1970 +0000 | |
|
78 | summary: adding cset to branch b | |
|
79 | ||
|
80 | changeset: 7:10ff5895aa57 | |
|
81 | branch: a branch name much longer than the default justification used by branches | |
|
82 | user: test | |
|
83 | date: Thu Jan 01 00:00:06 1970 +0000 | |
|
84 | summary: Adding d branch | |
|
85 | ||
|
66 | abort: you must specify a branch to use --closed | |
|
86 | 67 | changeset: 10:bfbe841b666e |
|
87 | 68 | branch: b |
|
88 | 69 | tag: tip |
General Comments 0
You need to be logged in to leave comments.
Login now