Brendan Cully <brendan@kublai.com> [Fri, 29 Sep 2006 13:01:19 -0700] rev 3197
Show copies in hg log.
The format is:
copies: destination (source)...
Brendan Cully <brendan@kublai.com> [Fri, 29 Sep 2006 13:00:54 -0700] rev 3196
Abstract manifest block parsing.
Brendan Cully <brendan@kublai.com> [Fri, 29 Sep 2006 13:00:36 -0700] rev 3195
Make hg.repository work with no path argument
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Sep 2006 21:24:45 +0200] rev 3194
merge with crew
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Sep 2006 21:24:15 +0200] rev 3193
Make "hg log --style=changelog > changelog" work (issue338)
Style files in templates/ now take precedence over current directory.
This can be overridden with --style=./changelog if really neeeded.
Added test for issue338.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Sep 2006 19:43:07 +0200] rev 3192
Clarify precedence for template/style in commands.show_changeset():
Display format will be the first non-empty hit of:
1. option 'template'
2. option 'style'
3. [ui] setting 'logtemplate'
4. [ui] setting 'style'
If all of these values are either the unset or the empty string,
regular display via changeset_printer() is done.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 29 Sep 2006 20:00:24 +0200] rev 3191
add remoteopts to bundle command
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 29 Sep 2006 19:59:06 +0200] rev 3190
factor opts: remote repo access options
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 29 Sep 2006 18:39:49 +0200] rev 3189
factor opts: --dry-run option
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 29 Sep 2006 18:39:32 +0200] rev 3188
factor opts: walk options
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 29 Sep 2006 18:39:08 +0200] rev 3187
factor opts: move globalopts to a more logical place
we will put other options at the same place
Brendan Cully <brendan@kublai.com> [Thu, 28 Sep 2006 11:41:33 -0700] rev 3186
mq: raise util.Abort instead of using sys.exit(1)
Brendan Cully <brendan@kublai.com> [Wed, 27 Sep 2006 14:50:20 -0700] rev 3185
mq: don't write applied patches into series twice in restore
Brendan Cully <brendan@kublai.com> [Wed, 27 Sep 2006 14:32:53 -0700] rev 3184
mq: bail out if a patch appears more than once in the series file.
Closes: #379.
Brendan Cully <brendan@kublai.com> [Wed, 27 Sep 2006 13:34:20 -0700] rev 3183
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
This moves most of the queue display code into qseries.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 27 Sep 2006 21:44:20 +0200] rev 3182
Merge with crew
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 27 Sep 2006 21:43:45 +0200] rev 3181
Documentation fixes for addremove.
- It is no longer deprecated, but the short help still included (DEPRECATED).
- Similarity parameter has to be 0<=s<=100 and not 0<=s<=1.
TK Soh <teekaysoh@yahoo.com> [Wed, 27 Sep 2006 08:27:16 -0500] rev 3180
hgk: fix mixup of --limit and REVRANGE in hgk call
Brendan Cully <brendan@kublai.com> [Wed, 27 Sep 2006 12:08:33 -0700] rev 3179
gitweb: cosmetic fixes.
Fix the padding around the changelog description.
Alternate row colours for the changeset file list.
Brendan Cully <brendan@kublai.com> [Wed, 27 Sep 2006 12:08:32 -0700] rev 3178
hgweb: yield filenode as well as node in annotate, use filenode in annotateline
Brendan Cully <brendan@kublai.com> [Wed, 27 Sep 2006 12:08:30 -0700] rev 3177
hgweb: fix changeset link in annotate view.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 27 Sep 2006 20:34:52 +0200] rev 3176
shortuser should stop before the first space character.
Examples:
"Foo Bar <foo.bar AT example DOT com>" -> "foo.bar"
(instead of "foo.bar AT example DOT com>" as it was before.)
"Foo Bar" -> "Foo"
Brendan Cully <brendan@kublai.com> [Wed, 27 Sep 2006 09:10:31 -0700] rev 3175
hgweb: make annotate line revisions point to annotation for that rev
Brendan Cully <brendan@kublai.com> [Wed, 27 Sep 2006 09:10:29 -0700] rev 3174
hgweb: fix annotate bugs
The parent and child links were broken.
Brendan Cully <brendan@kublai.com> [Wed, 27 Sep 2006 09:10:28 -0700] rev 3173
hgweb: use filectx.annotate instead of filelog
Brendan Cully <brendan@kublai.com> [Wed, 27 Sep 2006 09:10:21 -0700] rev 3172
Refactor annotate copy support.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 27 Sep 2006 09:35:53 +0200] rev 3171
merge with mainline
TK Soh <teekaysoh@yahoo.com> [Tue, 26 Sep 2006 14:40:21 -0500] rev 3170
do not disclose proxy user and password in debug messages
Matt Mackall <mpm@selenic.com> [Fri, 29 Sep 2006 17:50:59 -0500] rev 3169
merge: minor nullid cleanup
Matt Mackall <mpm@selenic.com> [Fri, 29 Sep 2006 17:47:51 -0500] rev 3168
context: add __nonzero__ methods
Matt Mackall <mpm@selenic.com> [Fri, 29 Sep 2006 16:39:38 -0500] rev 3167
merge: use repo.parents and parent contexts in update
Matt Mackall <mpm@selenic.com> [Fri, 29 Sep 2006 16:29:44 -0500] rev 3166
Add str methods to contexts
Matt Mackall <mpm@selenic.com> [Fri, 29 Sep 2006 16:01:46 -0500] rev 3165
Add equality operators to changectx and filectx
Matt Mackall <mpm@selenic.com> [Fri, 29 Sep 2006 15:56:36 -0500] rev 3164
localrepo.parents: return null context for no parents
Matt Mackall <mpm@selenic.com> [Fri, 29 Sep 2006 15:48:16 -0500] rev 3163
Add localrepo.parents to get parent changectxs.
Matt Mackall <mpm@selenic.com> [Tue, 26 Sep 2006 16:21:52 -0500] rev 3162
merge: move partial filtering out of manifest merge
Matt Mackall <mpm@selenic.com> [Tue, 26 Sep 2006 16:04:07 -0500] rev 3161
merge: move findcopies after workingmanifest
Matt Mackall <mpm@selenic.com> [Tue, 26 Sep 2006 15:58:51 -0500] rev 3160
findcopies: shortcut for empty working dir
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 26 Sep 2006 13:58:58 +0200] rev 3159
fix users of dirstate.copies broken by b1f10d3223c1
Matt Mackall <mpm@selenic.com> [Mon, 25 Sep 2006 22:26:54 -0500] rev 3158
Merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 24 Sep 2006 13:52:27 +0200] rev 3157
optimize revlog.lookup when passed hex(node)[:...]
Instead of converting each node from the filenode to a hex form,
convert the arg to a bin form.
For a revlog with 26711 entries, doing 100 lookup:
before: ~18s
after : ~13s
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 24 Sep 2006 13:52:25 +0200] rev 3156
cleanups in revlog.lookup
- add comments
- do a clean separation of the different cases
- don't use a list of each possible node when
doing the lookup, just keep the previous entry
Matt Mackall <mpm@selenic.com> [Mon, 25 Sep 2006 20:31:05 -0500] rev 3155
findcopies: use dirstate rename information
Matt Mackall <mpm@selenic.com> [Mon, 25 Sep 2006 17:53:17 -0500] rev 3154
dirstate: add copies function
rename copies to copymap
Matt Mackall <mpm@selenic.com> [Mon, 25 Sep 2006 16:45:31 -0500] rev 3153
Add core copy detection algorithm
This adds findcopies, which detects merge-relevant copies between
files in a pair of manifests back to the merge ancestor.
While the merge code invokes the copy detection routine, it does not
yet use the result.
Matt Mackall <mpm@selenic.com> [Mon, 25 Sep 2006 16:43:21 -0500] rev 3152
context: change filectx repr to use @
Avoids confusion with rev:nodeid syntax used elsewhere
Matt Mackall <mpm@selenic.com> [Fri, 22 Sep 2006 16:12:39 -0500] rev 3151
context: add __repr__ methods
Matt Mackall <mpm@selenic.com> [Fri, 22 Sep 2006 16:01:14 -0500] rev 3150
filectx: lazy linkrev usage
Matt Mackall <mpm@selenic.com> [Fri, 22 Sep 2006 15:34:02 -0500] rev 3149
restore filectx.changectx() method
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 22 Sep 2006 18:29:04 +0200] rev 3148
fix newline in error message
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 22 Sep 2006 17:58:22 +0200] rev 3147
add comments in cachefunc
Brendan Cully <brendan@kublai.com> [Fri, 22 Sep 2006 08:19:25 -0700] rev 3146
filectx.annotate: return filectx for each line instead of rev
Brendan Cully <brendan@kublai.com> [Fri, 22 Sep 2006 08:19:25 -0700] rev 3145
Add cachefunc to abstract function call cache
Brendan Cully <brendan@kublai.com> [Fri, 22 Sep 2006 08:19:25 -0700] rev 3144
Make filectx lazier - some users never use filenode
Brendan Cully <brendan@kublai.com> [Fri, 22 Sep 2006 08:19:25 -0700] rev 3143
context: handle fileid or changeid == 0
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 22 Sep 2006 08:48:56 +0200] rev 3142
merge with crew
Brendan Cully <brendan@kublai.com> [Tue, 19 Sep 2006 10:22:30 -0700] rev 3141
mq: Add --rev argument to qimport, to adopt existing changesets.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 20 Sep 2006 22:26:47 +0200] rev 3140
manifest.py: remove unnecessary method
Matt Mackall <mpm@selenic.com> [Thu, 21 Sep 2006 18:15:44 -0500] rev 3139
Switch revlog.ancestor to use revisions rather than nodeids
Matt Mackall <mpm@selenic.com> [Thu, 21 Sep 2006 16:16:39 -0500] rev 3138
mpatch: Fix for malloc corner case on AIX
Matt Mackall <mpm@selenic.com> [Thu, 21 Sep 2006 16:15:39 -0500] rev 3137
Merge with crew
Giorgos Keramidas <keramida@ceid.upatras.gr> [Wed, 20 Sep 2006 21:44:35 +0200] rev 3136
tests: add new test; test-mq-qrefresh
Matt Mackall <mpm@selenic.com> [Wed, 20 Sep 2006 16:50:50 -0500] rev 3135
Abstract ancestor algorithm into generic function
Make depth calculation non-recursive
Add simple shortcut for linear ancestry
Convert context to use ancestor function
make memoized parents function
Convert revlog to use ancestor function
Matt Mackall <mpm@selenic.com> [Tue, 19 Sep 2006 15:28:13 -0500] rev 3134
Merge with crew
Brendan Cully <brendan@kublai.com> [Tue, 19 Sep 2006 08:45:39 -0700] rev 3133
qimport: rename patch to patchname to avoid shadowing module
Brendan Cully <brendan@kublai.com> [Fri, 15 Sep 2006 15:23:52 -0700] rev 3132
Move defaultrev into changectx
This also causes tag on a repository with no working directory
to default to tip.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 18 Sep 2006 17:43:31 +0200] rev 3131
fix warnings spotted by pychecker
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 18 Sep 2006 17:32:28 +0200] rev 3130
hgweb: fix errors spotted by pychecker
TK Soh <teekaysoh@yahoo.com> [Mon, 18 Sep 2006 12:01:32 +0200] rev 3129
extdiff: use the default option only if the default program is used
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 18 Sep 2006 11:55:38 +0200] rev 3128
Merge with mainline
Mathieu Clabaut <mathieu.clabaut@systerel.fr> [Fri, 15 Sep 2006 22:55:17 +0200] rev 3127
Update [extdiff] configuration sample for vimdiff,
taking acount cmd.xxx and opts.xxx configurations item.
Matt Mackall <mpm@selenic.com> [Tue, 19 Sep 2006 14:58:54 -0500] rev 3126
filectx: add rename-aware ancestor algorithm
This code works but may trigger recursion depth issues
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 22:59:33 -0500] rev 3125
changectx: add ancestor function
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 22:58:11 -0500] rev 3124
filectx: allow passing filelog in init to avoid opening new filelogs
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 22:38:06 -0500] rev 3123
filelog: make metadata method private
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 22:20:44 -0500] rev 3122
filectx: add rename traversal for parents()
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 21:27:30 -0500] rev 3121
merge: simplify actions with helper function
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 21:11:26 -0500] rev 3120
merge: simplify local created logic
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 20:43:06 -0500] rev 3119
merge: simplify prompt code
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 20:38:02 -0500] rev 3118
merge: simplify exec flag handling
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 20:18:27 -0500] rev 3117
merge: simplify tests for local changed/remote deleted
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 20:10:54 -0500] rev 3116
merge: more simplification of m2 manifest scanning
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 20:00:14 -0500] rev 3115
merge: reorder tests on m2 items in manifestmerge
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 19:54:01 -0500] rev 3114
merge: eliminate redundant security check
duplicated in applyupdates
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 19:53:19 -0500] rev 3113
merge: eliminate confusing queued variable
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 18:28:50 -0500] rev 3112
merge: remove no longer possible clause
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 17:39:19 -0500] rev 3111
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 17:13:02 -0500] rev 3110
merge: remove linear variable
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 17:07:44 -0500] rev 3109
merge: simplify hook code
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 16:50:17 -0500] rev 3108
merge: linear_path -> linear
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 16:47:33 -0500] rev 3107
merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 16:13:34 -0500] rev 3106
merge: remove now unused umap dict
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 16:13:03 -0500] rev 3105
merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 16:02:09 -0500] rev 3104
Merge with mainline
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 15:59:59 -0500] rev 3103
merge: move set_exec to actions
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 15:54:51 -0500] rev 3102
merge: add forget to action list