Matt Mackall <mpm@selenic.com> [Mon, 25 Sep 2006 20:31:05 -0500] rev 3157
findcopies: use dirstate rename information
Matt Mackall <mpm@selenic.com> [Mon, 25 Sep 2006 17:53:17 -0500] rev 3156
dirstate: add copies function
rename copies to copymap
Matt Mackall <mpm@selenic.com> [Mon, 25 Sep 2006 16:45:31 -0500] rev 3155
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 3154
context: change filectx repr to use @
Avoids confusion with rev:nodeid syntax used elsewhere
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 24 Sep 2006 13:52:27 +0200] rev 3153
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 3152
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> [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
Matt Mackall <mpm@selenic.com> [Wed, 20 Sep 2006 16:50:50 -0500] rev 3136
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 3135
Merge with crew
Matt Mackall <mpm@selenic.com> [Tue, 19 Sep 2006 14:58:54 -0500] rev 3134
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 3133
changectx: add ancestor function
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 22:58:11 -0500] rev 3132
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 3131
filelog: make metadata method private
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 22:20:44 -0500] rev 3130
filectx: add rename traversal for parents()
Giorgos Keramidas <keramida@ceid.upatras.gr> [Wed, 20 Sep 2006 21:44:35 +0200] rev 3129
tests: add new test; test-mq-qrefresh
Brendan Cully <brendan@kublai.com> [Tue, 19 Sep 2006 08:45:39 -0700] rev 3128
qimport: rename patch to patchname to avoid shadowing module
Brendan Cully <brendan@kublai.com> [Fri, 15 Sep 2006 15:23:52 -0700] rev 3127
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 3126
fix warnings spotted by pychecker
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 18 Sep 2006 17:32:28 +0200] rev 3125
hgweb: fix errors spotted by pychecker
TK Soh <teekaysoh@yahoo.com> [Mon, 18 Sep 2006 12:01:32 +0200] rev 3124
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 3123
Merge with mainline
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 21:27:30 -0500] rev 3122
merge: simplify actions with helper function
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 21:11:26 -0500] rev 3121
merge: simplify local created logic
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 20:43:06 -0500] rev 3120
merge: simplify prompt code
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 20:38:02 -0500] rev 3119
merge: simplify exec flag handling
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 20:18:27 -0500] rev 3118
merge: simplify tests for local changed/remote deleted
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 20:10:54 -0500] rev 3117
merge: more simplification of m2 manifest scanning
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 20:00:14 -0500] rev 3116
merge: reorder tests on m2 items in manifestmerge
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 19:54:01 -0500] rev 3115
merge: eliminate redundant security check
duplicated in applyupdates
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 19:53:19 -0500] rev 3114
merge: eliminate confusing queued variable
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 18:28:50 -0500] rev 3113
merge: remove no longer possible clause
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 17:39:19 -0500] rev 3112
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 17:13:02 -0500] rev 3111
merge: remove linear variable
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 17:07:44 -0500] rev 3110
merge: simplify hook code
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 16:50:17 -0500] rev 3109
merge: linear_path -> linear
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 16:47:33 -0500] rev 3108
merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 16:13:34 -0500] rev 3107
merge: remove now unused umap dict
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 16:13:03 -0500] rev 3106
merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 16:02:09 -0500] rev 3105
Merge with mainline
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 15:59:59 -0500] rev 3104
merge: move set_exec to actions
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 15:54:51 -0500] rev 3103
merge: add forget to action list
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 15:24:00 -0500] rev 3102
merge: add codes to action list, eliminate None elements
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 15:10:56 -0500] rev 3101
merge: convert actions to list
Matt Mackall <mpm@selenic.com> [Fri, 15 Sep 2006 16:01:16 -0500] rev 3100
Merge with backout
Matt Mackall <mpm@selenic.com> [Fri, 15 Sep 2006 16:00:16 -0500] rev 3099
Back out trusted hgrc change for now
Backed out changeset 494521a3f1425
Matt Mackall <mpm@selenic.com> [Fri, 15 Sep 2006 15:22:45 -0500] rev 3098
Merge with crew
Matt Mackall <mpm@selenic.com> [Tue, 22 Aug 2006 21:02:25 -0500] rev 3097
merge: fold umap and added into m1 manifest
Matt Mackall <mpm@selenic.com> [Tue, 22 Aug 2006 19:39:54 -0500] rev 3096
merge: make unresolved a counter
Matt Mackall <mpm@selenic.com> [Tue, 22 Aug 2006 19:32:16 -0500] rev 3095
merge: use context code to retrieve manifests
Mathieu Clabaut <mathieu.clabaut@systerel.fr> [Fri, 15 Sep 2006 22:55:17 +0200] rev 3094
Update [extdiff] configuration sample for vimdiff,
taking acount cmd.xxx and opts.xxx configurations item.
Matt Doar <matt@xensource.com> [Wed, 13 Sep 2006 13:14:08 -0700] rev 3093
Add support for diffstat in commit emails, and move diffstat from
patchbomb to patch
Brendan Cully <brendan@kublai.com> [Thu, 14 Sep 2006 19:24:00 -0700] rev 3092
cat: default to working dir parent instead of tip
This introduces a defaultrev function that chooses
the working dir parent if a revision isn't specified,
and uses it in several places.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 15 Sep 2006 00:51:27 +0200] rev 3091
merge with brendan
Brendan Cully <brendan@kublai.com> [Wed, 13 Sep 2006 18:24:58 -0700] rev 3090
hgk: add --limit, and revranges
Brendan Cully <brendan@kublai.com> [Wed, 13 Sep 2006 13:50:28 -0700] rev 3089
hgk: add revision numbers
Brendan Cully <brendan@kublai.com> [Thu, 14 Sep 2006 22:52:47 +0200] rev 3088
mq: handle patch names containing ":"
Brendan Cully <brendan@kublai.com> [Thu, 14 Sep 2006 11:19:35 -0700] rev 3087
Move revision parsing into cmdutil.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 13 Sep 2006 14:37:51 -0300] rev 3086
Avoid negative block sizes in lazyparser.
This fixes a bug introduced by changeset baa3873eb387 .
Brendan Cully <brendan@kublai.com> [Thu, 14 Sep 2006 15:35:55 +0200] rev 3085
mq: add qdelete --forget option
This removes an applied patch from the series and status files without
popping it. It is useful when an mq patch has been applied upstream.
Brendan Cully <brendan@kublai.com> [Wed, 13 Sep 2006 16:41:03 -0700] rev 3084
mq: do not update an empty working directory after strip.
Closes #296.
Brendan Cully <brendan@kublai.com> [Tue, 12 Sep 2006 11:11:19 -0700] rev 3083
mq: Add --git option to qrefresh
john.levon@sun.com [Wed, 13 Sep 2006 21:46:36 +0200] rev 3082
Add the -s option to `hg help qseries`.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 13 Sep 2006 19:57:40 +0200] rev 3081
sshrepo: don't try to validate when creating the repo
- This removes the "repo not found" error when cloning or init-ing a remote
repo.
- Since the remote hg will abort if the repo already exists we don't need to
validate it.
Brendan Cully <brendan@kublai.com> [Wed, 13 Sep 2006 08:57:08 -0700] rev 3080
Make qrename handle directory targets; closes #333.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 12 Sep 2006 17:27:41 +0200] rev 3079
Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 12 Sep 2006 17:26:20 +0200] rev 3078
Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 11 Sep 2006 10:23:23 +0200] rev 3077
Fixed OSError "No such file or directory: None" and make IOError consistent.
The None error occurs when the current working directory is no longer
available, e.g. because it was removed in another shell.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 11 Sep 2006 10:08:30 +0200] rev 3076
If local repository is missing, make error message clearer.
Faheem Mitha suggested finding a better error message.
The nice error message is taken from cogito.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 10 Sep 2006 19:15:08 -0300] rev 3075
don't let lazyparser read more data than it can handle
This should fix issue368.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 09 Sep 2006 12:56:08 +0200] rev 3074
document changelog format
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 09 Sep 2006 12:51:05 +0200] rev 3073
merge with brendan
Brendan Cully <brendan@kublai.com> [Wed, 30 Aug 2006 15:13:45 -0700] rev 3072
strip: strip changelog before manifest
TK Soh <teekaysoh@yahoo.com> [Mon, 28 Aug 2006 16:30:48 -0500] rev 3071
extdiff: do not shell-quote options to new commands
revert a change introduced by 453097750fbf
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 08 Sep 2006 10:01:45 +0200] rev 3070
Include section name and parameter name (if available) in config errors.
Added tests for this.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 08 Sep 2006 09:36:18 +0200] rev 3069
Never apply string formatting to generated errors with util.Abort.
Otherwise error messages containing % chars yield errors or worse.
Fixed (hopefully) all users of util.Abort.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 08 Sep 2006 02:16:16 +0200] rev 3068
hg merge: fix lookup of branch
add some tests for branch usage
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 08 Sep 2006 01:07:21 +0200] rev 3067
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 08 Sep 2006 00:56:37 +0200] rev 3066
hgk.py: fix for a bug introduced in 32fd512ca7c0
TK Soh <teekaysoh@yahoo.com> [Thu, 07 Sep 2006 13:53:20 -0500] rev 3065
allow shell-quoting in command defaults
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 07 Sep 2006 14:13:01 +0200] rev 3064
hgk.py: use mercurial.patch functions when possible
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 07 Sep 2006 14:12:39 +0200] rev 3063
git --diff: fix traceback when getting mode change
- use the manifest instead of the mode in the working dir
if the diff is against two revisions
- add a testcase
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 07 Sep 2006 14:01:00 +0200] rev 3062
hgk.py: use nullid instead of a constant