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
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 06 Sep 2006 02:15:33 +0200] rev 3061
hgk.py: fix warnings from pychecker
- unused variables
- usage of undefined variables (opts and filterfiles)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 06 Sep 2006 02:13:08 +0200] rev 3060
hgk.py: add an optional file list to debug-diff-tree
this solves a problem when hgk was trying to display merges diff
Mikhail Sobolev <mss@mawhrin.net> [Tue, 27 Jun 2006 01:41:07 +0300] rev 3059
really treat the right side of acl.{allow,deny} as a list of users
the current implementation seems to expect only user per pattern, which
contradicts the documentation available at the file beginning.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 05 Sep 2006 11:33:47 +0200] rev 3058
merge crew with hg-churn
Shun-ichi GOTO <shunichi.goto@gmail.com> [Tue, 05 Sep 2006 12:40:45 +0900] rev 3057
Fix for Python 2.3 compatibility.
Note: Name of comparing function of sort() is "cmpfunc" in Python 2.3
and "cmp" in Python 2.4.
TK Soh <teekaysoh@yahoo.com> [Thu, 24 Aug 2006 16:12:23 -0500] rev 3056
hgk: use short changeset hashes
this fixes the missing tags on hgk window
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 05 Sep 2006 01:15:46 +0200] rev 3055
merge with brendan
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 05 Sep 2006 01:11:14 +0200] rev 3054
unlink temporary patch files even when an exception is raised
Brendan Cully <brendan@kublai.com> [Wed, 30 Aug 2006 13:42:57 -0700] rev 3053
Remove temporary git patch files
Brendan Cully <brendan@kublai.com> [Wed, 30 Aug 2006 13:12:26 -0700] rev 3052
Fix git patch application when cwd != repo.root