Lee Cantey <lcantey@gmail.com> [Mon, 21 Aug 2006 10:46:58 -0700] rev 3012
Allow for MB/sec transfer rates in test-http-proxy and test-ssh.
Also make the test more specific in test-http.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 22 Aug 2006 22:49:30 -0300] rev 3011
load extensions only after the ui object has been completely initialized
This fixes a traceback printed when hg tries to print another traceback
after an extension fails to be loaded. Add a test for that.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 22 Aug 2006 20:45:03 -0300] rev 3010
Only read .hg/hgrc files from trusted users/groups
The list of trusted users and groups is specified in the [trusted]
section of a hgrc; the current user is always trusted; "*" can be
used to trust all users/groups.
Global hgrc files are always read.
On Windows (and other systems that don't have the pwd and grp modules),
all .hg/hgrc files are read.
Edouard Gomez <ed.gomez@free.fr> [Wed, 23 Aug 2006 00:19:24 +0200] rev 3009
Fix hgk extension due to 4ec58b157265 refactoring
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 23 Aug 2006 08:42:21 -0700] rev 3008
merge.
Matt Mackall <mpm@selenic.com> [Tue, 22 Aug 2006 19:12:09 -0500] rev 3007
merge: add remove to the action hash
Matt Mackall <mpm@selenic.com> [Tue, 22 Aug 2006 18:06:17 -0500] rev 3006
merge: combine merge and get lists
Matt Mackall <mpm@selenic.com> [Tue, 22 Aug 2006 17:42:55 -0500] rev 3005
merge: remove redundant if
Matt Mackall <mpm@selenic.com> [Tue, 22 Aug 2006 17:26:44 -0500] rev 3004
merge: eliminate mw manifestdict, do everything with m1
Matt Mackall <mpm@selenic.com> [Tue, 22 Aug 2006 17:20:09 -0500] rev 3003
merge: eliminate usage of m1 after working manifest creation
Matt Mackall <mpm@selenic.com> [Tue, 22 Aug 2006 17:08:38 -0500] rev 3002
merge: simplify working dir manifest generation
Matt Mackall <mpm@selenic.com> [Tue, 22 Aug 2006 16:47:27 -0500] rev 3001
merge: simplify some update logic
Matt Mackall <mpm@selenic.com> [Tue, 22 Aug 2006 16:23:29 -0500] rev 3000
merge: hoist partial code out of manifest loops
Matt Mackall <mpm@selenic.com> [Tue, 22 Aug 2006 16:12:54 -0500] rev 2999
merge: minor simplification
Matt Mackall <mpm@selenic.com> [Mon, 21 Aug 2006 14:25:56 -0500] rev 2998
merge: rename mysterious variable
Matt Mackall <mpm@selenic.com> [Mon, 21 Aug 2006 14:21:42 -0500] rev 2997
merge: add backwards variable
Bryan O'Sullivan <bos@serpentine.com> [Tue, 22 Aug 2006 17:01:24 -0700] rev 2996
mq.el: Add comment to mq-edit-finish.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 22 Aug 2006 16:59:22 -0700] rev 2995
mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 22 Aug 2006 16:59:09 -0700] rev 2994
qheader: exit withh meaningful error code.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 22 Aug 2006 16:04:58 -0700] rev 2993
Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 22 Aug 2006 16:03:55 -0700] rev 2992
MQ: Make more commands return meaningful errors.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 22 Aug 2006 15:15:52 -0700] rev 2991
mercurial.el: deal with more vagaries of "hg status".
If we run "hg status" on a file that does not exist, it prints an error
message. Attempt to extract the name of the file.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 22 Aug 2006 15:14:35 -0700] rev 2990
qrefresh: exit with status 1 if no patches applied.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 22 Aug 2006 14:03:10 -0700] rev 2989
mercurial.el: add hg-cwd
Bryan O'Sullivan <bos@serpentine.com> [Tue, 22 Aug 2006 14:02:43 -0700] rev 2988
mercurial.el: speed up mode line updates.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 22 Aug 2006 11:37:18 -0700] rev 2987
mercurial.el: add hg-status.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 22 Aug 2006 11:36:58 -0700] rev 2986
mercurial.el: use parents in modeline, not tip
Bryan O'Sullivan <bos@serpentine.com> [Tue, 22 Aug 2006 11:24:59 -0700] rev 2985
mercurial.el: fix hg-chomp.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 22 Aug 2006 08:54:19 -0700] rev 2984
mercurial.el: fix calls to goto-char.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 22 Aug 2006 08:53:37 -0700] rev 2983
mercurial.el: get rid of unportable, unperformant use of replace-regexp.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 22 Aug 2006 07:55:10 -0700] rev 2982
merge.
Volker Kleinfeld <Volker.Kleinfeld@gmx.de> [Thu, 10 Aug 2006 16:59:58 +0200] rev 2981
Support the demandload syntax "@" in packagescan
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 22 Aug 2006 07:32:54 -0700] rev 2980
merge.
Shun-ichi GOTO <shunichi.goto@gmail.com> [Tue, 22 Aug 2006 14:31:56 +0900] rev 2979
Support foo@bar notation as demandload module spec.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 22 Aug 2006 10:20:21 +0200] rev 2978
Make test-strict append to $HGRCPATH, like other tests do since 61fcd9fac434.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 22 Aug 2006 10:18:40 +0200] rev 2977
Merge with tah
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 22 Aug 2006 10:08:42 +0200] rev 2976
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc
and add documentation for this.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 22 Aug 2006 09:55:14 +0200] rev 2975
Clear contents of global hgrc for tests before running each test.
This fixes running test-mq-qdiff after test-mq, because of changed settings.
Matt Mackall <mpm@selenic.com> [Sun, 20 Aug 2006 23:52:52 -0500] rev 2974
tag: shorten hash in default commit message
Move default message to commands.py
Pass node in binary for consistency
Remove default arguments
Fix up tests
Matt Mackall <mpm@selenic.com> [Sun, 20 Aug 2006 22:51:56 -0500] rev 2973
Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com> [Sun, 20 Aug 2006 21:59:51 -0500] rev 2972
Demote a pull note to a debug message
Bryan O'Sullivan <bos@serpentine.com> [Mon, 21 Aug 2006 21:59:29 -0700] rev 2971
Add ui.strict config item.
This turns off command matching by unambiguous prefix, and is a good
thing if you want to write future-proof scripts.
This fixes issue 314.
Lee Cantey <lcantey@gmail.com> [Mon, 21 Aug 2006 17:47:02 -0700] rev 2970
Ignore .DS_Store directories
These are used by Finder on OS X.
Lee Cantey <lcantey@gmail.com> [Mon, 21 Aug 2006 16:33:43 -0700] rev 2969
Allow for MB/sec transfer rates in test-http
Danek Duvall <danek.duvall@sun.com> [Mon, 21 Aug 2006 14:13:27 -0700] rev 2968
patch queue: portability.notes
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 21 Aug 2006 13:59:17 -0700] rev 2967
mq: fix bad interaction between demandload and update of commands.norepo
problem was that commands.norepo was not updated properly.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 21 Aug 2006 11:05:43 -0700] rev 2966
revert: add -a as alias for --all
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 21 Aug 2006 09:44:52 -0700] rev 2965
revert: require --all to revert all files.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 20 Aug 2006 02:21:59 -0300] rev 2964
fix typo in mail.py
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 20 Aug 2006 02:21:51 -0300] rev 2963
fix incoming -p
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 20 Aug 2006 01:13:11 -0300] rev 2962
dirstate.py: when comparing mtimes, use only the integer part.
Python 2.5 can return timestamps with subsecond resolution.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 20 Aug 2006 00:44:54 -0300] rev 2961
localrepo.status: detect clean files even when the mtime has changed
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 20 Aug 2006 00:44:53 -0300] rev 2960
Avoid Python 2.5 warning
demandload.py:112: Warning: 'as' will become a reserved keyword in Python 2.6
TK Soh <teekaysoh@yahoo.com> [Thu, 17 Aug 2006 15:30:45 -0500] rev 2959
extdiff: make new diff commands pick up their options correctly
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 18 Aug 2006 22:13:58 -0700] rev 2958
addremove: add -s/--similarity option
progress on issue 295.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 18 Aug 2006 21:18:01 -0700] rev 2957
fix comment.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 18 Aug 2006 21:17:28 -0700] rev 2956
merge.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 23 Jul 2006 09:04:14 -0700] rev 2955
addremove: do not deprecate.
command is too useful to drop.
is also best place to try autodetect of rename/copy by content similarity.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 18 Aug 2006 21:04:10 -0700] rev 2954
merge.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 18 Aug 2006 21:03:29 -0700] rev 2953
fix issue 322.
do not allow to add files that shadow files or directories already in dirstate.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 18 Aug 2006 17:02:38 -0700] rev 2952
merge.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Thu, 17 Aug 2006 21:13:35 +0300] rev 2951
add missing import of errno
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 18 Aug 2006 15:53:30 -0700] rev 2950
merge.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 18 Aug 2006 15:53:14 -0700] rev 2949
add other dir/file case to test for issue322.
Brendan Cully <brendan@kublai.com> [Fri, 18 Aug 2006 14:59:18 -0700] rev 2948
Teach annotate to follow copies.
Brendan Cully <brendan@kublai.com> [Fri, 18 Aug 2006 15:03:16 -0700] rev 2947
Add self to contributors
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 18 Aug 2006 14:49:12 -0700] rev 2946
add test for issue 322.
no .out file because issue is still live.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 18 Aug 2006 14:13:44 -0700] rev 2945
merge with self.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 18 Aug 2006 14:13:24 -0700] rev 2944
load extensions from every hgrc.
before this change only extensions in global hgrc files were loaded.
now extensions in per-repo hgrc are loaded.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 11 Aug 2006 16:12:14 -0700] rev 2943
refactor extension loading.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 18 Aug 2006 13:01:40 -0700] rev 2942
merge with brendan.
Brendan Cully <brendan@kublai.com> [Wed, 16 Aug 2006 19:55:42 -0700] rev 2941
mq: fix appliedname
Brendan Cully <brendan@kublai.com> [Wed, 16 Aug 2006 19:53:42 -0700] rev 2940
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com> [Wed, 16 Aug 2006 19:53:01 -0700] rev 2939
Add qnew -e option.
Brendan Cully <brendan@kublai.com> [Wed, 16 Aug 2006 19:52:21 -0700] rev 2938
allow qrefresh to take a list of files; closes #96.
Brendan Cully <brendan@kublai.com> [Wed, 16 Aug 2006 19:51:39 -0700] rev 2937
Fix test-mq-qdiff; add -I and -X options to qdiff
Brendan Cully <brendan@kublai.com> [Wed, 16 Aug 2006 19:50:50 -0700] rev 2936
Fix qfold after recent changes
Brendan Cully <brendan@kublai.com> [Wed, 16 Aug 2006 19:50:21 -0700] rev 2935
sed portability fixes
Brendan Cully <brendan@kublai.com> [Wed, 16 Aug 2006 19:49:45 -0700] rev 2934
Teach mq about git patches
Brendan Cully <brendan@kublai.com> [Wed, 16 Aug 2006 19:46:18 -0700] rev 2933
Move import's working dir update code into patch.updatedir
Danek Duvall <danek.duvall@sun.com> [Fri, 18 Aug 2006 10:24:04 -0700] rev 2932
Solaris portability fixes
Brendan Cully <brendan@kublai.com> [Fri, 18 Aug 2006 10:05:44 -0700] rev 2931
Fix bug #345.
The last hit for a file might have been before the last window, so we
can't clear copies. To reduce the load, we only store real copy
entries instead of storing hashes for every revision.
Brendan Cully <brendan@kublai.com> [Wed, 16 Aug 2006 11:03:45 -0700] rev 2930
patchbomb: import new mail module
Brendan Cully <brendan@kublai.com> [Wed, 16 Aug 2006 11:03:32 -0700] rev 2929
mail: fix connect
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 18 Aug 2006 13:07:35 +0200] rev 2928
merge with tah
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 18 Aug 2006 13:06:38 +0200] rev 2927
Fix hgweb's patch display in changeset view.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Tue, 15 Aug 2006 23:37:37 +0300] rev 2926
hgext: more patchbomb documentation
+ Add a description of how to enable this extension
+ Note which command it provides (it's not very easy to guess
that "hgext.patchbomb" enables the "email" command, unless one
can read Python sources)
+ Expand the descriptions of the -n and -m options of "hg email".
+ Mention that formail is (commonly) part of the procmail package.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 16 Aug 2006 10:53:01 -0700] rev 2925
make new tests executable.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Tue, 15 Aug 2006 21:49:49 +0300] rev 2924
tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr> [Tue, 15 Aug 2006 21:22:26 +0300] rev 2923
tests: new test for "hg annotate"
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 16 Aug 2006 10:52:42 -0700] rev 2922
override previous merge with mpm.
merge at ef8ee4477019 was bad.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 16 Aug 2006 10:52:19 -0700] rev 2921
redo merge with mpm.
previous merge at ef8ee4477019 was bad.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 16 Aug 2006 10:46:24 -0700] rev 2920
merge with mpm.
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 23:17:06 -0500] rev 2919
merge: consolidate dirstate updates
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 22:46:35 -0500] rev 2918
merge: use file size stored in revlog index
Add size method to filelog to handle nodes with renames
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 18:30:21 -0500] rev 2917
merge: move forgets to the apply stage
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 18:12:36 -0500] rev 2916
trivial bool() cleanup
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 16:28:00 -0500] rev 2915
filelog.cmp: return 0 for equality
spotted by Alexis Carvalho
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 16:27:19 -0500] rev 2914
merge: hoist some working manifest logic out of merge loop
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 16:12:51 -0500] rev 2913
merge: working manifest new/changed
To remove dependence on m1 during manifest comparison, we distinguish between
new and changed states in mw.
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 15:58:10 -0500] rev 2912
merge: factor out exec bit merge function
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 15:45:45 -0500] rev 2911
Use revlog hash comparison technique in merge
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 14:18:13 -0500] rev 2910
Move cmp bits from filelog to revlog
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 14:06:50 -0500] rev 2909
Move ui.sendmail to mail.connect/sendmail
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 11:34:08 -0500] rev 2908
Move ui.diffopts to patch.diffopts where it belongs
Brendan Cully <brendan@kublai.com> [Tue, 15 Aug 2006 11:28:50 -0700] rev 2907
Unify mq and hg patch invocation.
This makes patch a little less verbose by default, so the tests
had to be updated.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 15 Aug 2006 11:43:31 -0700] rev 2906
merge.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 15 Aug 2006 11:42:50 -0700] rev 2905
make test-mq-qdiff executable.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Tue, 15 Aug 2006 20:59:55 +0300] rev 2904
tests: new test for mq qdiff command
`hg qdiff .' is supposed to work but it is currently broken.
This test should help us verify when it gets fixed.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 15 Aug 2006 11:38:07 -0700] rev 2903
merge with other head by default, not tip.
fixes issue 339.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 15 Aug 2006 09:37:58 -0700] rev 2902
merge with mpm.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Tue, 15 Aug 2006 18:14:58 +0300] rev 2901
Tune a bit the extdiff toplevel comments/samples.
* Capitalize the first letter of all sentences
* Add an example for GNU diff(1) 'context diff' mode.
* Explain the requirement for separate cmd.xxx and opts.xxx
options in .hgrc, which hopefully will guard against users
trying to add:
[extdiff]
# Add a new Mercurial command called `cdiff', which calls
# GNU diff(1) in 'context diff' mode.
cmd.cdiff = diff -Nprc5
which fails for recent crew builds with:
$ hg cdiff .
making snapshot of 1 files from rev 07dc4a569f4e
making snapshot of 1 files from working dir
diff -Nprc5: not found
The correct way to do this is by separating the cmd.cdiff and
opts.cdiff parts like this:
[extdiff]
# Add a new Mercurial command called `cdiff', which calls
# GNU diff(1) in 'context diff' mode.
cmd.cdiff = diff
opts.cdiff = -Nprc5
so add it as a new example and explicitly describe it in the
extdiff comments.
Matt Mackall <mpm@selenic.com> [Mon, 14 Aug 2006 15:07:00 -0500] rev 2900
filelog: add hash-based comparisons
For status, rather than reconstruct full file versions from revlog for
comparison, compare hashes.
Matt Mackall <mpm@selenic.com> [Mon, 14 Aug 2006 14:42:15 -0500] rev 2899
Merge with crew
Matt Mackall <mpm@selenic.com> [Mon, 14 Aug 2006 14:14:08 -0500] rev 2898
merge: minor simplification
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 15 Aug 2006 16:04:47 +0200] rev 2897
Fixed test-extdiff.
diff-like tools usually return 1 if differences are found.
Currently the extdiff returns 256, but that's a different topic
(consolidating return code handling in hg).
Brendan Cully <brendan@kublai.com> [Tue, 15 Aug 2006 00:03:48 -0700] rev 2896
A fix for --prune.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 15 Aug 2006 11:47:17 +0200] rev 2895
Adjusted test to changed help output.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 15 Aug 2006 11:22:29 +0200] rev 2894
merge with jeffpc
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Tue, 15 Aug 2006 05:12:27 -0400] rev 2893
Use demandload in hgk