Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 25 Aug 2005 18:25:19 +0200] rev 1045
run the doc/* through aspell.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 25 Aug 2005 16:00:08 +0200] rev 1044
Removed forgotten debug print statement from commands.py and tests.
mpm@selenic.com [Wed, 24 Aug 2005 19:19:35 -0700] rev 1043
Update tests
mpm@selenic.com [Wed, 24 Aug 2005 19:16:45 -0700] rev 1042
Fix a couple fencepost errors in hg log
mpm@selenic.com [Wed, 24 Aug 2005 18:45:49 -0700] rev 1041
Fix hg log -p
mpm@selenic.com [Wed, 24 Aug 2005 18:42:42 -0700] rev 1040
Show number of new heads when doing a pull
mpm@selenic.com [Wed, 24 Aug 2005 18:40:17 -0700] rev 1039
Add debugdata for dumping revlog revision data
bos@eng-25.internal.keyresearch.com [Wed, 24 Aug 2005 14:46:02 -0700] rev 1038
Merge with MPM.
bos@serpentine.internal.keyresearch.com [Wed, 24 Aug 2005 14:45:35 -0700] rev 1037
Fix a small corner of log behaviour.
If invoked with no arguments in a subdirectory of the repo root, it
should print the history of the repository as a whole.
mpm@selenic.com [Wed, 24 Aug 2005 14:24:20 -0700] rev 1036
Update hg log docs
mpm@selenic.com [Wed, 24 Aug 2005 13:31:46 -0700] rev 1035
Merge with BOS
Bryan O'Sullivan <bos@serpentine.com> [Wed, 24 Aug 2005 13:26:45 -0700] rev 1034
Fix help output, and a few broken tests.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 24 Aug 2005 12:50:11 -0700] rev 1033
Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 24 Aug 2005 12:43:09 -0700] rev 1032
Get patchbomb working with tip again.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 24 Aug 2005 12:39:10 -0700] rev 1031
Rewrite log command. New version is faster and more featureful.
The original implementation of log walked backwards through history,
which had terrible behaviour. It took several minutes to view
complete kernel change history on a fast machine, for example.
The rewrite uses a windowed approach to walk hunks of history
forwards, while still giving results in reverse order. This reduces
run time from five minutes to five seconds on my system.
In addition, the rewrite uses our normal name handling mechanisms, so
you can run a command like "hg log net/ipv4/**.c" and get a useful
answer. It optimises for three different cases (no arguments, only
files, and anything goes), so it performs well in all circumstances
I've tested.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 23 Aug 2005 21:57:22 -0700] rev 1030
Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 23 Aug 2005 21:53:13 -0700] rev 1029
Emacs: implement hg-incoming, hg-outgoing and hg-push.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 23 Aug 2005 21:30:12 -0700] rev 1028
Add commands.debugconfig.
This lets us both view the actual config data that hg is using, and
drive editors that need to see this information.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 23 Aug 2005 16:46:10 -0700] rev 1027
Emacs: fix up hg-log and hg-diff to operate more uniformly.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 23 Aug 2005 15:42:06 -0700] rev 1026
Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 23 Aug 2005 15:30:06 -0700] rev 1025
Merge with MPM.
bos@serpentine.internal.keyresearch.com [Tue, 23 Aug 2005 15:27:17 -0700] rev 1024
Sync buffers prior to doing a diff.
mpm@selenic.com [Wed, 24 Aug 2005 03:33:54 -0700] rev 1023
Minor tweak to the revgen algorithm
mpm@selenic.com [Wed, 24 Aug 2005 03:32:08 -0700] rev 1022
Minor hgwebdir tweaks
- ignore / for PATH_INFO
- fix // in URLs
mpm@selenic.com [Wed, 24 Aug 2005 00:38:36 -0700] rev 1021
Add Makefile to the manifest
mpm@selenic.com [Wed, 24 Aug 2005 00:36:12 -0700] rev 1020
Add default make rule
The default make rule builds the extensions "in-place" so that hg can
be run out of the working directory.
mpm@selenic.com [Wed, 24 Aug 2005 00:32:10 -0700] rev 1019
Create helper functions for I/O to files in the working directory
This simplifies some code and gives us a single place to add I/O
filters.
mpm@selenic.com [Wed, 24 Aug 2005 00:12:04 -0700] rev 1018
Add some aliases
mpm@selenic.com [Wed, 24 Aug 2005 00:09:56 -0700] rev 1017
Fix up help for binary options
mpm@selenic.com [Tue, 23 Aug 2005 20:21:52 -0700] rev 1016
Teach annotate about binary files
mpm@selenic.com [Tue, 23 Aug 2005 19:58:46 -0700] rev 1015
Add automatic binary file detection to diff and export
Based on a patch by Fuming Wang
- add util.binary which decides whether a file is binary if it has any NUL
characters in the first 1K.
- teach mdiff.unidiff to print "binary file <x> has changed" for binary files
- add text flag to cause unidiff and dodiff to treat all files as text
- add -a and --text flags (like diff(1)) to hg diff and export
- update docs
mpm@selenic.com [Tue, 23 Aug 2005 18:58:26 -0700] rev 1014
Clean up argument passing for dodiff
mpm@selenic.com [Tue, 23 Aug 2005 16:19:14 -0700] rev 1013
Deal with repos with missing timezones
mpm@selenic.com [Tue, 23 Aug 2005 15:15:14 -0700] rev 1012
Merge with BOS
bos@serpentine.internal.keyresearch.com [Tue, 23 Aug 2005 14:51:52 -0700] rev 1011
Emacs: search for hg in path before looking in funny places.
mpm@selenic.com [Tue, 23 Aug 2005 14:21:19 -0700] rev 1010
Merge with TAH
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 22 Aug 2005 19:56:52 +0200] rev 1009
Don't show the diff in hgeditor if there are no changes in file contents.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 22 Aug 2005 08:46:43 +0200] rev 1008
Add Makefile for generating release tarballs.
- test suite is run
- documentation is generated and included
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 22 Aug 2005 08:39:44 +0200] rev 1007
Include generated documentation in MANIFEST.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 22 Aug 2005 08:33:02 +0200] rev 1006
Generate html documentation by default, too.
mpm@selenic.com [Tue, 23 Aug 2005 14:20:17 -0700] rev 1005
Merge with BOS
bos@serpentine.internal.keyresearch.com [Mon, 22 Aug 2005 15:29:55 -0700] rev 1004
Emacs: improved GNU Emacs support.
bos@serpentine.internal.keyresearch.com [Mon, 22 Aug 2005 15:08:20 -0700] rev 1003
Emacs support: numerous changes.
Most SCM commands now work in derived buffers (e.g. diff viewing
buffers) as well as buffers backed by files.
diff and log now work properly on repositories and files.
Commit support is more solid.
Doc strings are better.
bos@eng-25.internal.keyresearch.com [Mon, 22 Aug 2005 13:06:43 -0700] rev 1002
Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 22 Aug 2005 03:41:09 -0700] rev 1001
Emacs: update mode lines properly after commit.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 22 Aug 2005 03:27:27 -0700] rev 1000
Emacs: kill commit buffer once it's done with.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 22 Aug 2005 03:16:32 -0700] rev 999
Emacs: first cut at commit support.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 21 Aug 2005 23:33:02 -0800] rev 998
contrib/patchbomb: Fix buglet with empty cc list.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 21 Aug 2005 23:03:14 -0800] rev 997
Fix handling of addresses in hgrc.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 21 Aug 2005 22:46:57 -0800] rev 996
Emacs: document existing functions.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 21 Aug 2005 21:51:01 -0800] rev 995
Emacs support: add hg-revert-buffer.
mpm@selenic.com [Tue, 23 Aug 2005 12:46:43 -0700] rev 994
Fix callers to file.revision to use file.read
This was causing unchanged files to show up as modified.
mpm@selenic.com [Tue, 23 Aug 2005 02:19:38 -0700] rev 993
Clean up some merge logic
- rename mode to branch_merge
- use explicit update mode
- use negative mtime for updates that set mtime
- expand some cryptic variable names
- elaborate merge dirstate comments
- remove redundant manifest lookup for non-merge case
- remove impossible merge case
- fix up test cases
mpm@selenic.com [Mon, 22 Aug 2005 01:22:29 -0700] rev 992
Fix up some bugs introduced by recent merge changes
- use new changed list to track what files actually got new revlog entries
at commit/rawcommit time
- when updating a file during a merge, don't mark it as completely unchanged
- handle file not being in parent 1 in status
mpm@selenic.com [Sun, 21 Aug 2005 22:03:36 -0700] rev 991
merge: remove remaining mark bits
mpm@selenic.com [Sun, 21 Aug 2005 21:59:55 -0700] rev 990
Fix long-standing excessive file merges
Since switching to the multihead approach, we've been creating
excessive file-level merges where files are marked as merged with
their ancestors.
This explicitly checks at commit time whether the two parent versions
are linearly related, and if so, reduces the file check-in to a
non-merge. Then the file is compared against the remaining parent,
and, if equal, skips check-in of that file (as it's not changed).
Since we're not checking in all files that were different between
versions, we no longer need to mark so many files for merge. This
removes most of the 'm' state marking as well.
Finally, it is possible to do a tree-level merge with no file-level
changes. This will happen if one user changes file A and another
changes file B. Thus, if we have have two parents, we allow commit to
proceed even if there are no file-level changes.
mpm@selenic.com [Sun, 21 Aug 2005 16:51:50 -0700] rev 989
Reformat debugindex output
mpm@selenic.com [Sun, 21 Aug 2005 16:00:07 -0700] rev 988
Remove unused relfilter function
mpm@selenic.com [Sun, 21 Aug 2005 15:56:14 -0700] rev 987
hgweb: change startup argument processing
- allow passing a repo object instead of a path
(if we get a string, we construct a repo object)
- hg serve: pass options via repo.ui.setconfig
- add --style option
- get default name from repo.root rather than getcwd()
- remove template argument to hgweb()
- reduce create_server from 8 args to 1
mpm@selenic.com [Sun, 21 Aug 2005 15:00:02 -0700] rev 986
Add web:style option
mpm@selenic.com [Sun, 21 Aug 2005 13:18:45 -0700] rev 985
hgweb: fix RSS and raw for new % scheme
mpm@selenic.com [Sun, 21 Aug 2005 11:52:52 -0700] rev 984
Remove debug print
mpm@selenic.com [Sun, 21 Aug 2005 11:46:39 -0700] rev 983
Fix RSS feeds
mpm@selenic.com [Sat, 20 Aug 2005 13:11:36 -0700] rev 982
hgweb: convert index entries to list expansion style
mpm@selenic.com [Sat, 20 Aug 2005 13:08:07 -0700] rev 981
Merge with jeffpc
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 17 Aug 2005 22:59:47 -0500] rev 980
Merge with MPM
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 17 Aug 2005 22:32:47 -0500] rev 979
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 17 Aug 2005 22:08:15 -0500] rev 978
hgweb: Changed file revision page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 17 Aug 2005 22:03:28 -0500] rev 977
hgweb: Changed annotate page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 17 Aug 2005 21:59:02 -0500] rev 976
hgweb: Changed file page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 17 Aug 2005 21:45:44 -0500] rev 975
hgweb: Changed changelog page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 17 Aug 2005 21:14:20 -0500] rev 974
Added support for #foo%bar# syntax
This required moving template() into the templater class
mpm@selenic.com [Sat, 20 Aug 2005 11:59:10 -0700] rev 973
Deal with non-integer date offsets generated by some tools
mpm@selenic.com [Sat, 20 Aug 2005 01:46:57 -0700] rev 972
Added tag 0.6c for changeset eac9c8efcd9bd8244e72fb6821f769f450457a32
mpm@selenic.com [Sat, 20 Aug 2005 01:35:45 -0700] rev 971
Remove call to non-existent date_parser
mpm@selenic.com [Sat, 20 Aug 2005 01:29:04 -0700] rev 970
Fix possible unitialized variable warnings
mpm@selenic.com [Sat, 20 Aug 2005 00:49:41 -0700] rev 969
Minor README updates
Samuel Tardieu <sam@rfc1149.net> [Fri, 19 Aug 2005 23:26:32 -0800] rev 968
[PATCH] Take DST into account
Right now, mercurial doesn't take daylight saving time into account
because it uses time.timezone inconditionally, instead of resorting to
time.altzone if daylight saving time is on.
Samuel Tardieu <sam@rfc1149.net> [Fri, 19 Aug 2005 23:23:42 -0800] rev 967
[PATCH] Print timezone offset when outputting dates
Example:
% hg log | head -12
changeset: 791:41440890e57d2dbacde03a2a114e5114a031ea4a
tag: tip
user: Samuel Tardieu <sam@rfc1149.net>
date: Mon Jul 25 13:24:15 2005 +0200
summary: Parse various date formats when accepting user specified dates
[...]
changeset: 787:ba5c2021364ee876dae170e8f153e43bd0b2bd73
parent: 785:31a80e3723cee0a5991340facb2707e71983eb41
user: Bryan O'Sullivan <bos@serpentine.com>
date: Sun Jul 24 00:39:24 2005 -0800
summary: Get "forget" command to use new walk code.
[...]
mpm@selenic.com [Fri, 19 Aug 2005 23:07:31 -0800] rev 966
hg import: abort with uncommitted changes, override with --force
mpm@selenic.com [Fri, 19 Aug 2005 22:48:43 -0800] rev 965
Use post-expanded clone pathname as default
mpm@selenic.com [Fri, 19 Aug 2005 22:12:40 -0800] rev 964
hgweb: Make maxfiles, maxchanges, and allowpull proper config options
mpm@selenic.com [Fri, 19 Aug 2005 22:11:48 -0800] rev 963
Add -e and --remotecmd for clone and pull too
mpm@selenic.com [Fri, 19 Aug 2005 21:47:46 -0800] rev 962
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com [Fri, 19 Aug 2005 21:36:57 -0800] rev 961
Add --ssh and --remotecmd to push
This uses the new setconfig options passing mechanism
mpm@selenic.com [Fri, 19 Aug 2005 21:25:25 -0800] rev 960
Add ui.setconfig overlay
This can simplify option passing
mpm@selenic.com [Fri, 19 Aug 2005 18:56:20 -0800] rev 959
Fix option parsing bug for empty short options
mpm@selenic.com [Fri, 19 Aug 2005 18:47:05 -0800] rev 958
Make mercurial.el load with GNU emacs
mpm@selenic.com [Fri, 19 Aug 2005 17:22:04 -0800] rev 957
hgweb: sort repository list
mpm@selenic.com [Fri, 19 Aug 2005 17:01:11 -0800] rev 956
Fix hgwebdir virtual start-up
mpm@selenic.com [Fri, 19 Aug 2005 16:51:44 -0800] rev 955
Remove -C alias for --cwd
mpm@selenic.com [Fri, 19 Aug 2005 16:46:31 -0800] rev 954
Add hgwebdir.cgi to MANIFEST.in
mpm@selenic.com [Fri, 19 Aug 2005 16:45:25 -0800] rev 953
Merge with TAH
TK Soh <teekaysoh@yahoo.com> [Fri, 19 Aug 2005 06:04:46 +0100] rev 952
bash_completion: support GNU sed 3 and non-GNU sed
replaced command 'Q' introduced in GNU sed 4, in order to support
platforms with older sed.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 18 Aug 2005 21:35:36 +0100] rev 951
Read global config file /etc/mercurial/hgrc and fix reading hgrc on Windows.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 18 Aug 2005 13:55:45 +0100] rev 950
Removed TODO from MANIFEST.in
TK Soh <teekaysoh@yahoo.com> [Thu, 18 Aug 2005 13:33:39 +0100] rev 949
test fixes for Solaris 2.6
Solaris 2.6's stock sed doesn't support alternatives in regular
expression. We workaround by breaking up the regexp.
mpm@selenic.com [Fri, 19 Aug 2005 16:43:30 -0800] rev 948
Merge with BOS
Bryan O'Sullivan <bos@serpentine.com> [Fri, 19 Aug 2005 06:41:29 -0800] rev 947
In-progress Emacs snapshot.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 18 Aug 2005 17:49:43 -0800] rev 946
Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 18 Aug 2005 12:32:15 -0800] rev 945
Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 18 Aug 2005 12:27:57 -0800] rev 944
Initial skeleton for mercurial.el.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 18 Aug 2005 14:58:14 -0800] rev 943
Add --cwd global option, to change directory before doing anything.
Useful for interacting with a program presenting a UI, such as Emacs.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 18 Aug 2005 13:58:32 -0800] rev 942
Modify commands.walk to yield a 4-tuple.
The new element of the tuple indicates whether a name is an exact match
for one passed in on the command line.
mpm@selenic.com [Fri, 19 Aug 2005 16:38:25 -0800] rev 941
Add a multi-repository server
This merges a bunch of the ideas for a multi-repository CGI script and
simplifies things a bit.
It uses PATH_INFO so it generally wants paths of the form:
http://host/hg.cgi/virtualpath
This gets mapped via a simple config file to the real path. All info
about the repo is read from the repo's hgrc.
mpm@selenic.com [Wed, 17 Aug 2005 18:52:27 -0800] rev 940
Add in and out aliases
mpm@selenic.com [Wed, 17 Aug 2005 18:41:04 -0800] rev 939
Fix stray debug statement
mpm@selenic.com [Wed, 17 Aug 2005 17:57:37 -0800] rev 938
hgweb: add [web] section to hgrc
This makes almost all of the hgweb settings available in hgrc.
mpm@selenic.com [Wed, 17 Aug 2005 16:37:04 -0800] rev 937
Whitespace
mpm@selenic.com [Wed, 17 Aug 2005 12:26:06 -0800] rev 936
Add a simple remove test
mpm@selenic.com [Wed, 17 Aug 2005 12:22:12 -0800] rev 935
bash: Add smarter completion of add/commit/remove/forget/diff/revert
Use hg status to determine which files are interesting for various commands.
Thus, hg add [tab] finds unknown files, and hg commit [tab] finds added, modified, or removed files.
mpm@selenic.com [Wed, 17 Aug 2005 00:36:36 -0800] rev 934
Fix path handling for deleting files on merge
tksoh@users.sf.net [Wed, 17 Aug 2005 00:33:53 -0800] rev 933
Fixed --repository option when handling relative path
When specifying relative path to --repository option, 'log' and
'diff' were unable to find the files specified. Here's the fix.
mpm@selenic.com [Tue, 16 Aug 2005 23:49:53 -0800] rev 932
The TODO and the FAQ now live on the Wiki
mpm@selenic.com [Tue, 16 Aug 2005 22:47:49 -0800] rev 931
Fix incoming for empty set
mpm@selenic.com [Tue, 16 Aug 2005 21:33:50 -0800] rev 930
Fix incoming help test again
mpm@selenic.com [Tue, 16 Aug 2005 19:31:30 -0800] rev 929
Add incoming to completions
mpm@selenic.com [Tue, 16 Aug 2005 19:27:46 -0800] rev 928
hg incoming/outgoing: fix tests and update man page
mpm@selenic.com [Tue, 16 Aug 2005 19:17:16 -0800] rev 927
Add hg incoming command for local repositories
mpm@selenic.com [Tue, 16 Aug 2005 19:17:01 -0800] rev 926
Add a local() method to repository classes
mpm@selenic.com [Tue, 16 Aug 2005 19:03:01 -0800] rev 925
run-tests: remove '+ hg' trick
This was causing me a fair amount of debugging confusion. Let's just
forget it entirely. Updated tests to match.
TK Soh <teekaysoh@yahoo.com> [Tue, 16 Aug 2005 17:30:41 -0800] rev 924
updated help text and added manpage section for hg paths
Index: hg/doc/hg.1.txt
===================================================================
mpm@selenic.com [Tue, 16 Aug 2005 17:12:25 -0800] rev 923
Add basic https support for pull
mpm@selenic.com [Tue, 16 Aug 2005 15:55:33 -0800] rev 922
Teach bash_completion about outgoing
mpm@selenic.com [Tue, 16 Aug 2005 15:50:42 -0800] rev 921
show_changeset: -q shows short hash
mpm@selenic.com [Tue, 16 Aug 2005 15:49:26 -0800] rev 920
Add hg outgoing command
mpm@selenic.com [Tue, 16 Aug 2005 15:30:26 -0800] rev 919
whitespace cleanup
mpm@selenic.com [Tue, 16 Aug 2005 15:22:44 -0800] rev 918
hg cat: accept changeset hashes
mpm@selenic.com [Tue, 16 Aug 2005 14:53:47 -0800] rev 917
Fix hg clone race with writer
Most read operations in hg don't need locks because we order reads and
writes for consistency. Clone is an exception to this as we're copying
entire file histories and could end up with more file history copied
than we have commits.
For now, make clone take a lock on the source repo. Non-hardlinked
clone should eventually be changed to use lockless pull.
mpm@selenic.com [Tue, 16 Aug 2005 14:17:27 -0800] rev 916
Add bash_completion to contrib
Contributed by "Alexis S. L. Carvalho" <alexis@cecm.usp.br>
Attached is a file that implements bash completion for hg. Just
reading it from your .bashrc should be enough to use it - I think: I'm
using the /etc/bash_completion from debian and I'm not sure whether it
sets some important option.
It gets the list of commands, aliases and options from the output of hg
help and then adds some specific stuff - e.g. completing update with
tags; pull and push with path aliases and directories, etc.
mpm@selenic.com [Tue, 16 Aug 2005 13:52:28 -0800] rev 915
Let hg paths work outside of repositories
mpm@selenic.com [Tue, 16 Aug 2005 10:44:04 -0800] rev 914
Fix up help test
TK Soh <teekaysoh@yahoo.com> [Tue, 16 Aug 2005 10:42:30 -0800] rev 913
typo fix in command help text
This patch fixes a few typo errors on the command help output
(I am not sure if the change on 'diff' is the best though).
mark.williamson@cl.cam.ac.uk [Mon, 15 Aug 2005 11:46:41 -0800] rev 912
Minor tweak: os.STOPSIG -> os.WSTOPSIG. Pychecker spotted this one.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 15 Aug 2005 08:08:11 +0100] rev 911
Fix .hgignore parsing if last line has no EOL, ignore trailing white space.
(and don't use tabs in python code)
mpm@selenic.com [Sun, 14 Aug 2005 22:00:16 -0800] rev 910
Merge with TAH
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 15 Aug 2005 06:58:25 +0100] rev 909
Addes test for error messages when operating on non-existing files.
mpm@selenic.com [Sun, 14 Aug 2005 21:36:08 -0800] rev 908
Fix tests for new init command
Bryan O'Sullivan <bos@serpentine.com> [Sun, 14 Aug 2005 21:33:09 -0800] rev 907
Modify init command to take an optional directory to set up.
If the directory does not exist, it is created.
If no directory is given, the current directory is used.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 15 Aug 2005 06:18:49 +0100] rev 906
Update synopsis for 'hg update', too.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 15 Aug 2005 05:22:40 +0100] rev 905
Update online help of hg heads for new --branches option.
mason@suse.com [Sun, 14 Aug 2005 20:09:32 -0800] rev 904
Add optional parameter for changed/added/del/unknown files to commands.dodiff
This makes it possible to avoid a call into repo.changes if the details
of what has changed is already known
mason@suse.com [Sun, 14 Aug 2005 20:09:21 -0800] rev 903
Allow the changegroup generator to completely load the buffer.
This makes is possible to delete or truncate away revisions and still
use the changegroup later.
mason@suse.com [Sun, 14 Aug 2005 20:09:09 -0800] rev 902
Add optional stop revision to revlog.heads
mason@suse.com [Sun, 14 Aug 2005 20:09:01 -0800] rev 901
Change repo.comit to return None on error or the new revision number on
success
This allows the caller to correctly record the new revision number
mason@suse.com [Sun, 14 Aug 2005 20:08:35 -0800] rev 900
Add force option to repo.commit, allowing commits where no files change
mark.williamson@cl.cam.ac.uk [Sun, 14 Aug 2005 12:30:01 -0800] rev 899
Add '-' support to the commit logfile option to read message from stdin.
mason@suse.com [Sun, 14 Aug 2005 12:23:45 -0800] rev 898
Add searching for named branches
named branching is when you identify a head by a tag on an earlier revision.
This patch adds repo.branchlookup for searching through the tree to
find branch tags for heads.
hg update -b tag is added to checkout based on branch tags
hg heads -b is added to print the tag associated with each head
mpm@selenic.com [Sun, 14 Aug 2005 12:23:36 -0800] rev 897
Fix bug with empty inc and exc
This fixes an exception that showed up when importing patches
mpm@selenic.com [Sat, 13 Aug 2005 19:43:42 -0800] rev 896
Merge with BOS
Bryan O'Sullivan <bos@serpentine.com> [Sat, 13 Aug 2005 15:26:32 -0800] rev 895
Merge walk changes with Matt's tip.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 13 Aug 2005 15:23:06 -0800] rev 894
Merge with TAH.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 13 Aug 2005 15:13:37 -0800] rev 893
Turn off testing of absolute paths for now.
I don't know how to stop this from always reporting false errors, and am
too lazy to worry about it right now.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 13 Aug 2005 15:09:37 -0800] rev 892
Fix bug involving "hg debugwalk -Ipattern" from repository root.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 13 Aug 2005 14:41:51 -0800] rev 891
Fix clone when target directory is relative.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 16:12:09 -0800] rev 890
Merge walk fixes.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 16:10:09 -0800] rev 889
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 16:09:17 -0800] rev 888
Fix up handling of regexp paths.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 15:10:09 -0800] rev 887
Merge Windows path fixes.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 15:06:52 -0800] rev 886
Fix walk path handling on Windows
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 11:18:41 -0800] rev 885
Merge latest round of walk fixes.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 11:16:58 -0800] rev 884
Fix walk code for files that do not exist anywhere, and unhandled types.
Prior to this, a file that did not exist was reported as showing up in
the filesystem, as were files of unsupported types (such as fifos).
Now, an error message is printed and nothing is returned in such cases.
This change also moves the commands.pathto function to the util module,
as the walk code needs it to print non-confusing error messages.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 07:42:32 -0800] rev 883
Update to tip.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 10 Aug 2005 12:36:34 -0800] rev 882
Merge IPv6 fix.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 10 Aug 2005 12:35:25 -0800] rev 881
Fix problem with "hg serve" on systems not providing IPv6.
mason@suse.com [Fri, 12 Aug 2005 07:12:08 -0800] rev 880
addremove was not correctly finding removed files when given
a list of files to look at. These end up with a src of 'f' from
walk() but no longer exist on the filesystem.
Index: mine/mercurial/commands.py
===================================================================
mason@suse.com [Fri, 12 Aug 2005 07:10:21 -0800] rev 879
dirstate walking optimizations
The repo walking code introduces a number of calls to dirstate.map.copy(),
significantly slowing down the walk on large trees. When a list of
files is passed to the walking code, we should only look at map entries
relevant to the file list passed in.
dirstate.filterfiles() is added to return a subset of the dirstate map.
The subset includes in files passed in, and if one of the files requested
is actually a directory, it includes any files inside that directory tree.
This brings the time for hg diff Makefile down from 1.7s to .3s on
a linux kernel repo.
Also, the diff command was unconditionally calling makewalk, leading
to an extra pass through repo.changes. This patch avoids the call
to makewalk when commands.diff isn't given a list of patterns, cutting
the time for hg diff (with no args) in half.
Index: mine/mercurial/hg.py
===================================================================
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 10:17:12 -0800] rev 878
Merge patchbomb script.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 08:04:31 -0800] rev 877
Polish patchbomb script.
diffstat output is now a non-default option.
The hgrc file can now contain default information for the patchbomb
script.
Date generation is fixed.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 09 Aug 2005 20:53:50 -0800] rev 876
Get patchbomb script to not use MIME attachments.
Adding patches as attachments makes it difficult or impossible for some
mail clients to quote them effectively.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 09 Aug 2005 20:18:58 -0800] rev 875
Add patchbomb script.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 09:58:35 -0800] rev 874
Merge Chris's changes with mine.
mason@suse.com [Fri, 12 Aug 2005 09:57:59 -0800] rev 873
addremove was not correctly finding removed files when given
a list of files to look at. These end up with a src of 'f' from
walk() but no longer exist on the filesystem.
Index: mine/mercurial/commands.py
===================================================================
mason@suse.com [Fri, 12 Aug 2005 09:57:56 -0800] rev 872
dirstate walking optimizations
The repo walking code introduces a number of calls to dirstate.map.copy(),
significantly slowing down the walk on large trees. When a list of
files is passed to the walking code, we should only look at map entries
relevant to the file list passed in.
dirstate.filterfiles() is added to return a subset of the dirstate map.
The subset includes in files passed in, and if one of the files requested
is actually a directory, it includes any files inside that directory tree.
This brings the time for hg diff Makefile down from 1.7s to .3s on
a linux kernel repo.
Also, the diff command was unconditionally calling makewalk, leading
to an extra pass through repo.changes. This patch avoids the call
to makewalk when commands.diff isn't given a list of patterns, cutting
the time for hg diff (with no args) in half.
Index: mine/mercurial/hg.py
===================================================================
Bryan O'Sullivan <bos@serpentine.com> [Tue, 09 Aug 2005 17:24:38 -0800] rev 871
Merge with mpm.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 07 Aug 2005 12:43:11 -0800] rev 870
Teach walk code about absolute paths.
The first consequence of this is that absolute and relative paths now
all work in the same way. The second is that paths that lie outside
the repository now cause an error to be reported, instead of something
arbitrary and expensive being done.
Internally, all of the serious work is in the util package. The new
canonpath function takes an arbitrary path and either returns a
canonical path or raises an error. Because it needs to know where the
repository root is, it must be fed a repository or dirstate object, which
has given commands.matchpats and friends a new parameter to pass along.
The util.matcher function uses this to canonicalise globs and relative
path names.
Meanwhile, I've moved the Abort exception from commands to util, and
killed off the redundant util.CommandError exception.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 07 Aug 2005 11:09:21 -0800] rev 869
Kill dead function.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 07 Aug 2005 11:04:58 -0800] rev 868
Fix debugwalk when there's nothing to walk.
tksoh@users.sourceforge.net [Sat, 13 Aug 2005 12:41:00 -0800] rev 867
Allow Mercurial to build on HP-UX 11
Temporary fix to allow Mercurial to build on HP-UX 11, as the C
compiler on HP-UX 11 doesn't support 'inline' qualifier. The
'__inline' qualifier seemed to be supported, but not without
first resolving other associated issues.
mpm@selenic.com [Fri, 12 Aug 2005 23:54:09 -0800] rev 866
Merge with TAH
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 10 Aug 2005 08:41:23 +0100] rev 865
Cleanup after previous changes:
- there are only two states for the exec bit, so no need to override it.
- file_ variable is only once now, so it self.file(f) can be used directly.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 10 Aug 2005 08:23:42 +0100] rev 864
Extended test case to test dirstate length bug fixed in a7e95e3606c7.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 10 Aug 2005 07:51:37 +0100] rev 863
Use length of file instead of length of change for the dirstate entry.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 10 Aug 2005 06:47:46 +0100] rev 862
Fix 3-way-merge of original parent, workdir and new parent.
The dirstate has to match what is in the repository (what would be
checked out with 'hg update -C'), because the resulting file may be
identical to the new parent, or it may be completely different.
Previously the dirstate wasn't updated, so if you changed the file to
look like the original parent, it might be considered unmodified
relative to the new parent.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 09 Aug 2005 11:32:30 +0100] rev 861
dirstate.changes() now distinguishes 'hg remove'd or just deleted files.
Interface is not yet changed.
Non-regular files are considered to be removed or deleted.
Removed the unneeded match(fn) call for adding to the unknown list.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 09 Aug 2005 11:15:57 +0100] rev 860
Use correct term "closed interval" for ranges.
Edouard Gomez <ed.gomez@free.fr> [Tue, 09 Aug 2005 09:36:34 -0800] rev 859
Trap OSError when deleting env vars
On the other OS, it seems that case insensitivity for
environment vars can bite users when using some unknown
combination of python 2.4.1 and win2kSP4+minsys (and
probably other vversions of these softwares).
The best way to avoid problems in those weird cases is to
ignore OSError exception during env var deletion.
Jeff Sipek <jeffpc@optonline.net> [Mon, 08 Aug 2005 19:49:48 -0800] rev 858
[PATCH] Move default page name into map file
Move default page name from code into the map file. This way, different
hgweb styles/themes are free to select their default (no cmd in args)
page.
Jeff Sipek <jeffpc@optonline.net> [Mon, 08 Aug 2005 19:49:34 -0800] rev 857
[PATCH] Propagate the template map though recursively
This patch allows propagates the template map though recursively
though all the templates.
This allows for some hgweb template cleanup patches as well as it makes
writing new skins/themes for hgweb much much easier. (I'm planing to
write several basic ones.)
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 07 Aug 2005 17:41:13 +0100] rev 856
Fixed encoding of directories ending in .d or .i:
One .d and .i was mixed up, and string replace method doesn't work in-place.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 06 Aug 2005 21:59:22 +0100] rev 855
Added Tristan Wibberley to contributors.
Tristan Wibberley <tristan@wibberley.org> [Sat, 06 Aug 2005 21:58:28 +0100] rev 854
Fixed revlog.children.
It was comparing a node to a rev, then appending a rev onto the list
of children being constructed instead of a node.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 06 Aug 2005 21:41:53 +0100] rev 853
Update TODO
Samuel Tardieu <sam@rfc1149.net> [Sat, 06 Aug 2005 21:23:38 +0100] rev 852
Allow HG patch to appear late in the input stream
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 06 Aug 2005 21:19:32 +0100] rev 851
Added Samuel Tardieu to contributors list.
Samuel Tardieu <sam@rfc1149.net> [Sat, 06 Aug 2005 21:18:21 +0100] rev 850
Add temporary documentation files and profiling output to .hgignore
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 06 Aug 2005 15:43:12 +0100] rev 849
Further help improvements:
Show command aliases in 'hg help something', unless in quiet mode.
Show short command description with 'hg help -q something'.
Show global options in verbose mode of command help.
State that Mercurial is a Distributed SCM.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 06 Aug 2005 14:04:59 +0100] rev 848
Always show short help when an unknown command is given.
kreijack@inwind.REMOVEME.it [Sat, 06 Aug 2005 13:33:14 +0100] rev 847
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it [Sat, 06 Aug 2005 13:27:31 +0100] rev 846
When hg is invoked without parameters, the short list help is displayed.
When hg is executed without parameters ( or hg is executed with the
'help shortlist' command ) the short help list is displayed.
If the 'help' command is passed on the commandline the full help list
is displayed.
In both the cases if the switch '-v' is passed, the help contains also
the aliases of the short/full commands list and the global switches.
kreijack@inwind.REMOVEME.it [Sat, 06 Aug 2005 13:27:31 +0100] rev 845
More verbose information on the global options
kreijack@inwind.REMOVEME.it [Sat, 06 Aug 2005 13:27:31 +0100] rev 844
'hg help -v' mentions the alias of the commands
kreijack@inwind.REMOVEME.it [Sat, 06 Aug 2005 13:27:31 +0100] rev 843
'hg help -v' shows global options
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 06 Aug 2005 12:05:09 +0100] rev 842
Rewritten change type selection for hg status.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 06 Aug 2005 07:16:37 +0100] rev 841
Realigned command table again.
tksoh@users.sourceforge.net [Sat, 06 Aug 2005 07:09:10 +0100] rev 840
hg status: added options to select files by status.
Added options -m, -a, -r and u to select files corresponding
to status M, A, R and ? respectively. If none of these
options are specified, files of all status will be shown.
mpm@selenic.com [Thu, 04 Aug 2005 13:31:25 -0800] rev 839
Merge with BOS
Bryan O'Sullivan <bos@serpentine.com> [Thu, 04 Aug 2005 05:14:59 -0800] rev 838
Merge with Matt.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 03 Aug 2005 09:10:48 -0800] rev 837
Fix performance of hg diff.
commands.walk has been refactored. commands.walk's behaviour remains as
it was, but there is a new function, commands.makewalk. This returns
results that can be passed along to other internal code, in our case
dodiff.
mpm@selenic.com [Thu, 04 Aug 2005 13:27:41 -0800] rev 836
Merge with TAH
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 04 Aug 2005 18:23:07 +0100] rev 835
Cleaned up trap handling in run-tests, too.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 04 Aug 2005 18:20:40 +0100] rev 834
Use sh instead of bash in tests.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 04 Aug 2005 18:13:17 +0100] rev 833
Removed special FIXME handling in run-tests, added bug info to .out files.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 04 Aug 2005 18:06:49 +0100] rev 832
Handle broken pipe on pressing Ctrl-C with e.g. 'hg log|grep something'.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 04 Aug 2005 17:43:05 +0100] rev 831
Cleaned up trap handling:
- Use numbers instead of signal names
- No need to explicitly call "cleanup_exit RC" to exit with return code RC.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 04 Aug 2005 17:23:31 +0100] rev 830
If rejects are empty after using the editor, merge with diff+patch was ok.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 04 Aug 2005 17:16:41 +0100] rev 829
Shortened hgmerge a little bit.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 04 Aug 2005 16:56:44 +0100] rev 828
Hide error message of type command.
"Wallace, Eric S" <eric.s.wallace@intel.com> [Thu, 04 Aug 2005 13:25:59 -0800] rev 827
Fix array overflow bug in bdiff
I ran into a bug while importing a large repository into mercurial.
The diff algorithm does not allocate a big enough array of hunks
for some test cases. This results in memory corruption, and possibly,
as in my case, a seg fault.
You should be able to reproduce this problem with any case of more
than a few lines that follows this pattern:
a b
= =
1 1
2
2 3
4
3 5
.
4 .
.
5
.
.
.
I.e., "a" has blank lines on every other line that have been removed in
"b". In this case, the number of matching hunks is equal to the number
of lines in "b". This is more than ((an + bn)/4 + 2). I'm not sure what
motivates this formula, but when I changed it to the smaller of an or
bn (+ 1), it works.
[comment added by mpm]
Kyle Moffett <mrmacman_g4@mac.com> [Thu, 04 Aug 2005 13:22:36 -0800] rev 826
Allow import from files with spaces
Index: hg/mercurial/commands.py
===================================================================
Samuel Tardieu <sam@rfc1149.net> [Thu, 04 Aug 2005 13:21:27 -0800] rev 825
Add an option to hg serve to serve file using IPv6
mpm@selenic.com [Tue, 02 Aug 2005 08:57:32 -0800] rev 824
Merge with BOS
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 01 Aug 2005 17:58:13 +0100] rev 823
Use list comprehension in hg status.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 31 Jul 2005 18:03:46 -0800] rev 822
Attempt to yield names in sorted order when walking.
This is an improvement in behaviour, but the walk and changes code still
has some flaws that make sorted name presentation difficult:
- changes returns tuples of names, instead of a sorted list of (name,
status) pairs.
- walk yields deleted names after all others.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 31 Jul 2005 17:54:00 -0800] rev 821
Ensure that dirstate.walk only yields names once.
Its predecessor code used to do this, and now it does, too.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 31 Jul 2005 17:42:46 -0800] rev 820
Clean up walk and changes code to use normalised names properly.
New function: commands.pathto returns the relative path from one path
to another. For example, given foo/bar and baz/quux, it will return
../../baz/quux. This new function is used by the walk and status code
to print relative paths correctly.
New command: debugwalk exercises the walk code without doing anything
more.
hg.dirstate.walk now yields normalised names. For example, if you're
in the baz directory and you ask it to walk ../foo/bar/.., it will yield
names starting with foo/.
As a result of this change, all of the other walk and changes methods
in this module also return normalised names.
The util.matcher function now normalises globs and path names, so that
it will match normalised names properly.
Finally, util.matcher uses the non-glob prefix of a glob to tell walk
which directories to scan. Perviously, a glob like foo/* would scan
everything, but only return matches for foo/*. Now, foo/* only scans
under foo (using the globprefix function), which is much faster.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 31 Jul 2005 17:31:15 -0800] rev 819
Update output for test-merge5.
mpm@selenic.com [Mon, 01 Aug 2005 23:34:23 -0800] rev 818
Actually implement the -f switch for push
mpm@selenic.com [Mon, 01 Aug 2005 23:23:51 -0800] rev 817
Make ssh URL parsing more robust
mpm@selenic.com [Mon, 01 Aug 2005 23:17:22 -0800] rev 816
Warn on pushing unsynced repo or adding new heads
By popular demand
mpm@selenic.com [Sat, 30 Jul 2005 09:01:59 -0800] rev 815
Psyco was failing to call dirstate.__del__ for import
Remove it.
mpm@selenic.com [Sat, 30 Jul 2005 09:00:14 -0800] rev 814
Merge with BOS
Bryan O'Sullivan <bos@serpentine.com> [Fri, 29 Jul 2005 15:02:27 -0800] rev 813
Adapt commit to use file matching code.
The code is slightly complicated by the need to commit all outstanding
changes in the repository if no file names are given (other commands
operate on the current directory and its subdirectories in this case).
localrepository.changes has acquired an optional match parameter, to let
it filter out include/exclude options.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 29 Jul 2005 12:30:12 -0800] rev 812
Reduce the amount of stat traffic generated by a walk.
When we switched to the new walk code for commands, we no longer passed a
list of specific files to the repo or dirstate walk or changes methods.
This meant that we always walked and attempted to match everything,
which was not efficient.
Now, if we are given any patterns to match, or nothing at all, we still
walk everything. But if we are given only file names that contain no
glob characters, we only walk those.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 29 Jul 2005 08:51:42 -0800] rev 811
Fix documentation of -I and -X options.
These options apply to all names, not just to directories. In other
words, you can do something like this:
hg add -X 'f*' '*.c'
and it will have the effect of "add all files matching *.c, except those
starting with f".
Bryan O'Sullivan <bos@serpentine.com> [Fri, 29 Jul 2005 08:49:01 -0800] rev 810
Move commands.forget over to using new walk code.
With no names, it now recursively forgets everything, as is the default
behaviour of other commands. And prints the names of all files it
hasn't specifically been told to forget.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 29 Jul 2005 08:42:28 -0800] rev 809
Fix performance regression in addremove command.
When I rewrote addremove, I lazily put a call to repo.changes in,
which was unnecessary and slow. This is a new rewrite, preserving the
file name behaviour, but replacing the call to repo.changes with a walk,
which is much cheaper, and avoids calls to os.stat on all but files that
have probably been deleted.
mpm@selenic.com [Sat, 30 Jul 2005 08:35:29 -0800] rev 808
Merge with TAH
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Jul 2005 22:31:45 +0100] rev 807
Include tests (or possibly maps) ending in numbers in MANIFEST, too.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Jul 2005 22:10:36 +0100] rev 806
Add Makefile from doc directory instead of / to MANIFEST.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Jul 2005 22:07:42 +0100] rev 805
Drop .err files generated by failed tests from the MANIFEST.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Jul 2005 21:50:05 +0100] rev 804
Incorporated most of Aron Griffis suggestions for sh compatibility.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Jul 2005 21:34:41 +0100] rev 803
Use tabs instead of spaces where apropriate.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Jul 2005 15:59:10 +0100] rev 802
Allow tests for not yet fixed bugs to fail without generating error diff.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Jul 2005 15:21:02 +0100] rev 801
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Jul 2005 15:19:43 +0100] rev 800
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Jul 2005 15:11:34 +0100] rev 799
Adapted README to new needs.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Jul 2005 15:11:05 +0100] rev 798
Make tests work on Solaris:
- replacement for mktemp
- fall back if shell arithmetic doesn't work
- replacement for 'set -x' (which results look different with some shells)
- "FOO=bar; export FOO" instead of "export FOO=bar"
- don't use 'if ! ...'
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Jul 2005 14:54:36 +0100] rev 797
Remove "export FOO=bar" bashism.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Jul 2005 14:52:45 +0100] rev 796
Replaced mktemp and usage of ${par:=word}.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Jul 2005 14:51:41 +0100] rev 795
Remove usage of ${par:-word}, which and mktemp. Quote filenames.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Jul 2005 14:49:04 +0100] rev 794
Ignore test error files, protect dot in .pc/
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Jul 2005 06:43:21 +0100] rev 793
Merge with upstream
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 23 Jul 2005 17:14:05 +0100] rev 792
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 23 Jul 2005 17:11:29 +0100] rev 791
Show all dirstate info for 'hg debugstate'.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 23 Jul 2005 17:09:37 +0100] rev 790
Make test-pull work on slow machines, where hg serve needs some time to start.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 23 Jul 2005 17:08:12 +0100] rev 789
Fixed test to notice .out file generated by run-test.
mpm@selenic.com [Sat, 30 Jul 2005 08:30:12 -0800] rev 788
add note about -C to update message
mpm@selenic.com [Thu, 28 Jul 2005 07:46:08 -0800] rev 787
Drop -t option from mktemp
mpm@selenic.com [Wed, 27 Jul 2005 18:50:32 -0800] rev 786
Fix the directory and revlog collision problem
This adds escaping for directory names so that directory foo.i doesn't
collide with the revision data for file foo.
mpm@selenic.com [Wed, 27 Jul 2005 18:16:20 -0800] rev 785
Fix undo after aborted commit bug
Commit would overwrite undo.dirstate unconditionally, so an undo after
an aborted commit would restore the dirstate from the aborted commit
and not the prior transaction.
This copies dirstate to journal.dirstate and moves it after a
successful transaction.
mpm@selenic.com [Wed, 27 Jul 2005 10:21:19 -0800] rev 784
Fix tests for short changeset hashes and hidden manifest hashes
Stephen Darnell [Wed, 27 Jul 2005 10:18:44 -0800] rev 783
Add a --time command line option to time hg commands
thananck@yahoo.com [Wed, 27 Jul 2005 10:18:22 -0800] rev 782
Provided platform dependent implementations for explain_exit
os.system return code is system dependent.
mpm@selenic.com [Wed, 27 Jul 2005 10:05:12 -0800] rev 781
Fix copy in subdirectories
Spotted by Chad Netzer
mpm@selenic.com [Wed, 27 Jul 2005 09:07:28 -0800] rev 780
Add changegroup hook for push/pull
TK Soh <teekaysoh@yahoo.com> [Wed, 27 Jul 2005 08:19:59 -0800] rev 779
Add paths command
The following patch adds the 'paths' commands to show a named path, or list of
available paths. In case anyone find it useful.
mpm@selenic.com [Wed, 27 Jul 2005 08:14:52 -0800] rev 778
Shorten hashes displayed in log
mpm@selenic.com [Wed, 27 Jul 2005 07:35:36 -0800] rev 777
Wrap RSS description in CDATA
Problem spotted by Ollivier Robert
mpm@selenic.com [Tue, 26 Jul 2005 19:27:05 -0800] rev 776
Add template to mktemp call
Based on a patch from Soh Tk-r28629
mpm@selenic.com [Tue, 26 Jul 2005 19:23:59 -0800] rev 775
Fix up test results
No more errnos
diff | sed changes
.out message ok
mpm@selenic.com [Tue, 26 Jul 2005 19:03:45 -0800] rev 774
Change sed patterns in tests to strip dates after spaces or tabs
mpm@selenic.com [Tue, 26 Jul 2005 21:52:40 -0500] rev 773
Hide errno in abort messages
mpm@selenic.com [Mon, 25 Jul 2005 12:02:29 -0500] rev 772
Make pull count jargon less confusing
revisions are now synonymous with changesets, and not file changes
mpm@selenic.com [Sat, 23 Jul 2005 14:11:49 -0500] rev 771
Fixes for annotate
Handle files that aren't in the repo
Handle empty files
mpm@selenic.com [Sat, 23 Jul 2005 10:14:42 -0500] rev 770
Fix bug in exception handling for hardlink clone
mpm@selenic.com [Sat, 23 Jul 2005 10:08:40 -0500] rev 769
hgeditor: hide checksum mismatch message from md5sum
mpm@selenic.com [Sat, 23 Jul 2005 10:00:56 -0500] rev 768
Fix local file changes being ignored after non-branch merge
Bug introduced in eea96285cbf9
Spotted by TAH
Bryan O'Sullivan <bos@serpentine.com> [Fri, 22 Jul 2005 19:46:02 -0800] rev 767
Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 22 Jul 2005 19:45:48 -0800] rev 766
Get addremove to use new walk code.
It is now more verbose than it used to be. If given file names, it
prints nothing, as before. But if given patterns or nothing, it prints
the names of the files it is operating on, to remove that air of mystery.
It also now operates at or below the current directory.
mpm@selenic.com [Fri, 22 Jul 2005 20:07:14 -0500] rev 765
Hack to fix missing '/' problem in URLs
mpm@selenic.com [Fri, 22 Jul 2005 19:23:00 -0500] rev 764
Don't mark files with 'm'erge unless we're actually merging branches
For 3-way merges, we were marking files as 'm', which should only be
used for branch merges. This was causing files to show up in 'hg
status' that aren't actually modified.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 22 Jul 2005 16:27:30 +0100] rev 763
Added deprecation warnings if -t or --text is used for commits.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 22 Jul 2005 16:26:46 +0100] rev 762
Changed more occurances of 'text' to 'message'.
Andrew Thompson <andrewkt@aktzero.com> [Fri, 22 Jul 2005 15:59:13 +0100] rev 761
Change all references to -t --text commit message to -m and --message.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 22 Jul 2005 09:54:22 +0100] rev 760
Changed coding hint to BOM
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 22 Jul 2005 09:40:45 +0100] rev 759
Updated TODO.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 22 Jul 2005 08:58:16 +0100] rev 758
There was an extra space after 'hg id' when there are no tags.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 22 Jul 2005 08:47:35 +0100] rev 757
Updated help strings and test-help:
- options -I/-X: always at the end, don't include them in the synopsis.
- NAME is optional for hg revert
- other small changes.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 22 Jul 2005 08:11:49 +0100] rev 756
Added new code contributors, fixed Vincent's name, added hint on encoding.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 22 Jul 2005 07:42:47 +0100] rev 755
Show filenames for hg export in verbose mode on a separate lines.
This makes parsing by external tools much easier.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 22 Jul 2005 07:30:52 +0100] rev 754
Fixes and cleanups to hgeditor:
- "HG: merge resolve" isn't supported for a long time now.
- detection of unchanged commit message if signing is turned off.
- don't add manifest hash to commit message if not signing.
mpm@selenic.com [Thu, 21 Jul 2005 18:20:13 -0500] rev 753
Check protocol versions
This also allows the old unidentified protocol
mpm@selenic.com [Thu, 21 Jul 2005 18:19:20 -0500] rev 752
Simplify content type checking
Muli Ben-Yehuda <mulix@mulix.org> [Thu, 21 Jul 2005 18:18:43 -0500] rev 751
When pulling from a non hg repository URL (e.g. http://www.kernel.org/hg)
you geta pretty obscure error (zlib: uknown compression type). The
attached patch modifies hgweb.py and hg.py to supply and check a
'Content-type: application/hg-0.1' HTTP header for the branches,
between and changegroup commands, so that we know it's a proper hg
repo before snarfing the input. Comments appreciated!
mpm@selenic.com [Thu, 21 Jul 2005 15:29:35 -0500] rev 750
Add tag -t, deprecate tag -m
manifest hash: 893aa9732b500edfa6ffc099f76b00a88a5b1943
mpm@selenic.com [Thu, 21 Jul 2005 15:05:17 -0500] rev 749
Update tests to use commit -m and default -u
manifest hash: 6e4385453843031a712005a320d6000595b40d05
mpm@selenic.com [Thu, 21 Jul 2005 12:40:28 -0500] rev 748
Update test output for status change
manifest hash: da9effa63afe6ec22389e17f7fc2daeb3bb4f0e0
mpm@selenic.com [Thu, 21 Jul 2005 12:29:19 -0500] rev 747
Add -m for rawcommit
manifest hash: cf066b609ab4854a731c103f1d456d89cf5e1312
mpm@selenic.com [Thu, 21 Jul 2005 12:24:42 -0500] rev 746
Change C to M in status
mpm@selenic.com [Thu, 21 Jul 2005 12:23:55 -0500] rev 745
Add -m for commit and deprecate -t
Index: hg/doc/hg.1.txt
===================================================================
mpm@selenic.com [Thu, 21 Jul 2005 12:22:54 -0500] rev 744
Handle empty file list for annotate
mpm@selenic.com [Thu, 21 Jul 2005 12:22:29 -0500] rev 743
Remove ls command
mpm@selenic.com [Thu, 21 Jul 2005 12:21:33 -0500] rev 742
Refactor matchpats and walk
Move core match function code to util
Add some comments and whitespace
Simplify options
Use lambdas instead of always and never
mpm@selenic.com [Wed, 20 Jul 2005 20:11:23 -0500] rev 741
Fix some line wrapping
manifest hash: 43af5dafa55e01f89727096f4d6784317f3eb0d6
mpm@selenic.com [Wed, 20 Jul 2005 20:00:29 -0500] rev 740
Merge from BOS
manifest hash: 2276dbd96bb4221e579c871a1de2403c92c85659
Bryan O'Sullivan <bos@serpentine.com> [Wed, 20 Jul 2005 04:08:11 -0800] rev 739
Split make_file back out into make_filename and make_file.
It turns out that make_filename is useful by itself.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 20 Jul 2005 03:55:16 -0800] rev 738
If the argument to make_file can act like a file, return it.
This is useful for code that calls command functions, but doesn't
want to send I/O through the filesystem.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 20 Jul 2005 03:52:06 -0800] rev 737
Merge with Matt's tip.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 20 Jul 2005 03:43:05 -0800] rev 736
Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 20 Jul 2005 03:37:01 -0800] rev 735
An empty .hgignore file must cause us to ignore nothing, not everything!
Bryan O'Sullivan <bos@serpentine.com> [Wed, 20 Jul 2005 03:24:54 -0800] rev 734
Update docs for annotate and diff.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 20 Jul 2005 03:23:12 -0800] rev 733
Convert annotate over to walk interface.
Add emptyok parameter to walk and matchpats, for commands that require
at least one name.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 20 Jul 2005 03:16:20 -0800] rev 732
Convert diff command over to using walk code.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 20 Jul 2005 03:01:23 -0800] rev 731
Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 20 Jul 2005 02:57:20 -0800] rev 730
Only walk over files that match our criteria.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 20 Jul 2005 02:48:16 -0800] rev 729
Turn make_filename into make_file, which returns a file handle.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 19 Jul 2005 07:51:34 -0800] rev 728
Fix typo.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 19 Jul 2005 07:42:36 -0800] rev 727
Get commands to raise Abort instead of ui.warn(...),sys.exit(1).
Bryan O'Sullivan <bos@serpentine.com> [Tue, 19 Jul 2005 07:15:59 -0800] rev 726
Add a source designator to the walk methods.
If the source is 'f' (the filesystem), the file definitely exists in
the filesystem. If 'm' (a rev or dirstate manifest), the file may not
still exist with the given name.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 19 Jul 2005 07:00:03 -0800] rev 725
Merge with Matt's tip.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 18 Jul 2005 06:54:21 -0800] rev 724
Get add and locate to use new repo and dirstate walk code.
They use a walk function that abstracts out the irritating details, so
that there's a higher likelihood of commands behaving uniformly.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 16 Jul 2005 15:13:40 -0800] rev 723
Work on walk code.
mpm@selenic.com [Wed, 20 Jul 2005 11:40:27 -0500] rev 722
Add doc/Makefile to MANIFEST
manifest hash: 1fc29da9334caa71ff8df55c52747f9c93df7e0f
mpm@selenic.com [Tue, 19 Jul 2005 15:09:04 -0500] rev 721
Fix verify error reporting bug
Spotted by Chris Mason
manifest hash: d5a6e5cb65d2de65a68d1f85c8692e79622844d3
mason@suse.com [Tue, 19 Jul 2005 12:41:08 -0500] rev 720
Change hgit revision lookup to use repo.lookup
mason@suse.com [Tue, 19 Jul 2005 12:40:46 -0500] rev 719
Fix hgit usage of repo.changes and fancyopts to reflect current hg api
jdc@uwo.ca [Sun, 17 Jul 2005 08:39:44 +0100] rev 718
Fix typos in FAQ
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 16 Jul 2005 17:25:05 +0100] rev 717
Be even more specific with .hgignore regexps, added *.swp files.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Be even more specific with .hgignore regexps, added *.swp files.
manifest hash: 6664148b687983a41ef50d5bd4fd40426fb96621
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC2TThW7P1GVgWeRoRAhObAJ9ZuBxwCBSTZ9MSonw4q1EaluxMMQCfdrBo
Czu2RdQEK4RZQh/ngzm73p8=
=8XOM
-----END PGP SIGNATURE-----
Bryan O'Sullivan <bos@serpentine.com> [Sat, 16 Jul 2005 17:19:58 +0100] rev 716
Fix up ignore regexps.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 16 Jul 2005 07:58:56 +0100] rev 715
Make annotate use option --rev instead od --revision like other commands.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Make annotate use option --rev instead od --revision like other commands.
manifest hash: fe9c9cd9d42657f60d302b557f1f33640fd51199
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC2LAwW7P1GVgWeRoRAqYKAJ4tiLIVTRN0Ot6bjrEZRc9VFrk3zwCdGx/C
PhOGWMHVlNYGZxmdXridIc4=
=J7Cn
-----END PGP SIGNATURE-----
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 16 Jul 2005 07:56:39 +0100] rev 714
Some cleanups in commands.annotate().
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Some cleanups in commands.annotate().
manifest hash: 9581ad3bb9ebc418e4772158c505e34b92496e92
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC2K+nW7P1GVgWeRoRAr3VAKCGvKbhmG4yweZTgmxIgaZlmz16HQCdFupq
BKcWfEn17Y1l6IDbGS0rDyI=
=/fR/
-----END PGP SIGNATURE-----
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 15 Jul 2005 21:31:35 +0100] rev 713
Added missing newline after two error messages.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Added missing newline after two error messages.
manifest hash: c730cdf92c66ee5b44a4cd9b67f72deb844e4010
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC2B0mW7P1GVgWeRoRAjXJAJ48fbg6jXN65pBPGW/YmWn9OtKakACgjnr9
DPySaeLr3/bU7KhFdZPI7/4=
=Lvsx
-----END PGP SIGNATURE-----
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 15 Jul 2005 13:42:19 +0100] rev 712
Merge with myself.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Merge with myself.
manifest hash: e47e1ba87ecb28a08f819401fd8c2a88bc830261
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC168rW7P1GVgWeRoRAmknAJ0ea1BrnM1KSnfPqkYpurFpV+booACcDGNh
ka6ciaH1pQLhOyKgqdbqwOA=
=pOV4
-----END PGP SIGNATURE-----
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 15 Jul 2005 12:17:03 +0100] rev 711
Show filename for hg export in verbose mode.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Show filename for hg export in verbose mode.
manifest hash: 4fbb7bb566ef04e64079fb1fd61974ad47f22e7c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC15svW7P1GVgWeRoRAleQAJ4kXmyj+56kTb5lV9VrQYpu4O3h5ACfXU5W
M0TB/OvU0g5uvudZVQMsJd0=
=yq7Y
-----END PGP SIGNATURE-----
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 15 Jul 2005 12:06:29 +0100] rev 710
Use dirstate to check if .hgtags needs to be added.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Use dirstate to check if .hgtags needs to be added.
manifest hash: f90af1553754eb703fc457ffdd5ded0de6fa47e0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC15i1W7P1GVgWeRoRArDvAKCSxWDCbwU12ICwwVUoe753H8GYIwCfZGs0
HcL8cOp+eHz85AMJJE/xfck=
=1xKK
-----END PGP SIGNATURE-----
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 15 Jul 2005 10:58:19 +0100] rev 709
Fix synopsis: hg forget needs at least one file name.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix synopsis: hg forget needs at least one file name.
manifest hash: 1386189a11f9bc539ae2c4bf93333235931d8bc6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC14i7W7P1GVgWeRoRAj3OAKCBPkYzoxOHu0Xp/vZ6Myz6JGM4hACgimU+
Gw1Av4ESM2ivORd8ulHMdBc=
=kDiv
-----END PGP SIGNATURE-----
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 15 Jul 2005 10:07:55 +0100] rev 708
Use changelogentry.tmpl for search results, too.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Use changelogentry.tmpl for search results, too.
Since both are lists of changelog entries, they don't need to look different.
This fixes a bug where only changelogentry was updated, but searchentry not.
manifest hash: 9bfe7a3dd4512d3ee4e5538f369371bce6d55520
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC13zrW7P1GVgWeRoRAghNAJ9Agd+uPQ2iGdHAnjebr2R/RzAzUACdEyWq
+yKY7wp16TD72ls6Q49LHJg=
=9aSM
-----END PGP SIGNATURE-----
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 15 Jul 2005 09:38:57 +0100] rev 707
Changed command synopsises to match style of common UNIX tools.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Changed command synopsises to match style of common UNIX tools.
manifest hash: cf62235e46f5c06ac5a3c88cb61e9b57d35fe222
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC13YhW7P1GVgWeRoRAnSOAKCOtrYHZ2XMTjpphY/G2UZHcJcZeQCdFsgv
D5Hu+s9ahVX8hns2ZbQpriI=
=g6NW
-----END PGP SIGNATURE-----
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 15 Jul 2005 08:32:45 +0100] rev 706
Make "hg parents REV" work (again?)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Make "hg parents REV" work (again?)
manifest hash: d14db0d23b539ad0b754a51a83926d14f1be9a6e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC12adW7P1GVgWeRoRAtknAJ9TeUybLWYWY+Bi2b5grmAspgfemwCeP9cd
6mYSTWIsovCqW59KIrEvVVo=
=u5nR
-----END PGP SIGNATURE-----
mpm@selenic.com [Thu, 14 Jul 2005 22:56:55 -0800] rev 705
Merge with TAH
manifest hash: 197e0d1a0d7376a9eb72381330462f06490ab821
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 14 Jul 2005 22:51:47 +0100] rev 704
Make makelock and readlock work on filesystems without symlink support.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Make makelock and readlock work on filesystems without symlink support.
This way you can have a repository on a fat partiton, e.g. a USB stick.
manifest hash: cea2c120ef2b25a50c5d98b59648f773feefe470
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC1t5yW7P1GVgWeRoRAsKjAJ9BFcn/EqBK/dmJ4BY1pPIZIbDDJACghN3p
VCQS6CJ72MHpzhOOsnOpHzE=
=laDT
-----END PGP SIGNATURE-----
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 14 Jul 2005 17:28:19 +0100] rev 703
merge program setting from hgrc wasn't used.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
merge program setting from hgrc wasn't used.
manifest hash: 49da647e02534f51324a7a955a34c64c05bd8fa0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC1pKjW7P1GVgWeRoRAt6AAJ9ZB6NerDpWA/k2ZZeN6VUsSDkB8wCePhMd
Xr+Tb86zo+xFhHq7YkDvLak=
=+BY9
-----END PGP SIGNATURE-----
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 14 Jul 2005 17:22:20 +0100] rev 702
Fix default values and add interactive setting to [ui] section of hgrc docs.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix default values and add interactive setting to [ui] section of hgrc docs.
manifest hash: 211eea218970b45b2a0cdc822d5b6610a89ffbd7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC1pE8W7P1GVgWeRoRAof+AJ4mpm3DCRqh+9To3Gn4bpC7UGcTnQCfVIWN
5VT9pqdP6/06tH8nYgW55f4=
=uNyy
-----END PGP SIGNATURE-----
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 14 Jul 2005 16:57:01 +0100] rev 701
On importing the result of 'hg export', parse while reading and drop headers.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On importing the result of 'hg export', parse while reading and drop headers.
manifest hash: 385cb4205bb6e4291a412d740400de44bd2e4014
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC1otNW7P1GVgWeRoRAiSpAJ4jGhjyEnI2aqCM6pgC8KWSWRkDugCgkVMK
rd/YNziDK3TNRhI3yKNrLVw=
=w6ht
-----END PGP SIGNATURE-----
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 14 Jul 2005 16:23:13 +0100] rev 700
Removed extra spaces for default parameters according to PEP8.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Removed extra spaces for default parameters according to PEP8.
manifest hash: 0f6bcc95adf406c8f6dafd92b7c7d3523b6dfe2c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC1oNhW7P1GVgWeRoRAn76AJ4m8rFUeeUDRC0qVEmjjmPClmAFsQCdE3rN
Juv2dSoGteRm0DBXz7xnF4c=
=PMki
-----END PGP SIGNATURE-----
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 14 Jul 2005 15:56:11 +0100] rev 699
Removed duplicate use of os.path.normcase().
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Removed duplicate use of os.path.normcase().
manifest hash: cccacfb66a4de9abc20095b28e6bab9b51dc4fa9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC1n0LW7P1GVgWeRoRAueGAJ9256Jiwv4QbrFIV3Px/SmBMkddjQCbBop/
J2Yi2np72OAKVPhFhCijH6s=
=aAyf
-----END PGP SIGNATURE-----
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 14 Jul 2005 15:30:49 +0100] rev 698
Use python function instead of external 'cp' command when cloning repos.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Use python function instead of external 'cp' command when cloning repos.
Inspired by a patch from Stephen Darnell.
manifest hash: b525b0bf40f349b362db7c46d62be41572ef65cf
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC1ncZW7P1GVgWeRoRAiJmAJ9GaCPaG6yOKb72I+SpDDdcdXTISACePD0H
GR/F+qqzi2imdgIV77ziLcQ=
=YVd2
-----END PGP SIGNATURE-----
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 14 Jul 2005 10:42:28 +0100] rev 697
Multiple cleanups of things detected by pylint.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Multiple cleanups of things detected by pylint.
Spacing, multiple statements on a single line, overloading builtins,
except statements without exception type, unused variables, etc.
manifest hash: 457b33b30200d9f71ca707a0bef78053d9091107
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC1jOEW7P1GVgWeRoRApr5AJoClL7FkGXT9Z36xF71zdVH463O0wCeJJwb
gJSn0jHlLZ3m25OI+BuZCrI=
=HVDq
-----END PGP SIGNATURE-----
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 14 Jul 2005 10:37:33 +0100] rev 696
Removed extra newline in hg log when not using the --patch option, fixed tests.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Removed extra newline in hg log when not using the --patch option, fixed tests.
manifest hash: 4d83d4af68581affe4cd2dacf840ec78bf18311e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC1jJdW7P1GVgWeRoRAkoIAJ4kI8WFisp8fJTMsUCddLwK0O1mHQCgj+fx
XDIXrDpUULYSSck3eD4QHY4=
=jKKB
-----END PGP SIGNATURE-----
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 14 Jul 2005 08:57:54 +0100] rev 695
Fixed tests.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fixed tests.
manifest hash: f6f36e6f95ea99efccc84dfa1d0af63d414a0eba
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC1hsCW7P1GVgWeRoRAtbyAJoDpbSygoutryu3P/miCpX2Q/LA8gCgiClo
P+1ZpH0gycio/V4CKmj5Hlo=
=JVBT
-----END PGP SIGNATURE-----
mpm@selenic.com [Thu, 14 Jul 2005 22:37:46 -0800] rev 694
Teach convert-repo about tags
Git tags are bad, very bad. More importantly, they're horribly
inconsistent. This drops tags which don't appear to work like most of
the others.
manifest hash: f2dda9e9a3ae8a0d84b19e496059b8a795b8e603
mpm@selenic.com [Thu, 14 Jul 2005 18:41:36 -0800] rev 693
Be quiet about broken pipes
manifest hash: 3163ebe2f15c3a577456cfdcd2b136c3c7cf7378
mpm@selenic.com [Wed, 13 Jul 2005 01:53:27 -0800] rev 692
convert-repo: deal with packed git and other fixes
call out to git-cat-file directly to deal with packed files
use git-diff-tree --root to handle import of first commit
quiet some dirstate warnings
fix parent logic in commit
whitespace bits
topological sort fix
manifest hash: 2943af0168dd2f5e85bba6515fd08687e264863f
mpm@selenic.com [Wed, 13 Jul 2005 01:48:03 -0800] rev 691
HG environment variables take precedence over hgrc
manifest hash: c128b53429f861c0b75c2a81c6ad4907e4779810
mpm@selenic.com [Wed, 13 Jul 2005 01:46:50 -0800] rev 690
Minor merge fixups
return a proper errorlevel on abort
let force jump across branches
catch exception on unlink
manifest hash: 6787814cd75e9f9623c56dc36f865afd54f56bfa
mpm@selenic.com [Wed, 13 Jul 2005 01:42:48 -0800] rev 689
Make manifest lookup use changeset ids
manifest hash: 83cf1ac9c68ad9e8de29d2c629c8a06eaeeeae15
mpm@selenic.com [Wed, 13 Jul 2005 01:41:49 -0800] rev 688
Repair the hgweb search interface
manifest hash: f5c644f14b31da897dc66f96c2852ae1f11f43f1
Matt Mackall <mpm@selenic.com> [Tue, 12 Jul 2005 20:55:42 -0800] rev 687
Hide file hashes in log
There are six different kinds of revision numbers and hashes:
changeset hash and local number
manifest hash and local number
file hash and local number
We really ought to expose only the changeset hash and local number, so
begin hiding the others from the end user
manifest hash: 40d07cc930e84a9283d5e03ade23e3454401e148
Matt Mackall <mpm@selenic.com> [Tue, 12 Jul 2005 00:51:49 -0800] rev 686
Reapply startswith() changes that got lost with stale edit
manifest hash: 16d7feedd561591a21727a4c13a1223019d802a7
Matt Mackall <mpm@selenic.com> [Mon, 11 Jul 2005 21:58:57 -0800] rev 685
Added tag 0.6b for changeset 4ccf3de52989b14c3d84e1097f59e39a992e00bd
Matt Mackall <mpm@selenic.com> [Mon, 11 Jul 2005 21:56:29 -0800] rev 684
Turn off signing with hgeditor by default
manifest hash: f2732475351ee22d78e0dab629db03f1f215b21f
Matt Mackall <mpm@selenic.com> [Mon, 11 Jul 2005 21:54:37 -0800] rev 683
Revert hgeditor change to manifest bits
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Revert hgeditor change to manifest bits
I'd rather have a blank line at the top.
This code primarily exists to show possible methods of signing
changesets so I'm not very concerned about conciseness or performance.
I should probably have all the signing commented out or disabled by
default.
manifest hash: 764da8d65bdaf9b45c7e3efd6cd2b4ee70979417
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFC01sdywK+sNU5EO8RAr2BAJ9Uq0XberFrYyehvmoKgE8p/j0XFQCdFPJr
DPDMbKeBHwK/yMiileBFW8o=
=DvnD
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Mon, 11 Jul 2005 21:51:06 -0800] rev 682
Revert hgeditor md5sum change
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Revert hgeditor md5sum change
My copy of md5sum doesn't do --status
manifest hash 509a316ca72aca095c590fb120eb2ee8260814dd
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFC01pKywK+sNU5EO8RAkDWAJ0dWHz3Vp5oR2be9k3d1Km2Br53xgCgrBLF
Ja2tOYCu/nP4sh3CsOsIO78=
=zHkj
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Mon, 11 Jul 2005 15:07:04 -0800] rev 681
Sort files for removal
Matt Mackall <mpm@selenic.com> [Mon, 11 Jul 2005 15:06:32 -0800] rev 680
Handle undeletion of files when checking out old revisions
Spotted by Marc Singer
Matt Mackall <mpm@selenic.com> [Mon, 11 Jul 2005 10:28:20 -0800] rev 679
Actually move .hg into ignore
Matt Mackall <mpm@selenic.com> [Sun, 10 Jul 2005 17:11:27 -0800] rev 678
Alternate fix for SIGHUP on the other OS
Suggested by K Thananchayan
Matt Mackall <mpm@selenic.com> [Sun, 10 Jul 2005 16:19:36 -0800] rev 677
Fix up test for update flags
Andrew Thompson <andrewkt@aktzero.com> [Sun, 10 Jul 2005 16:17:05 -0800] rev 676
Remove references to 'cloning by hardlink' from tests.
# HG changeset patch
# User Andrew Thompson <andrewkt@aktzero.com>
# Node ID c12a49438454e9782ff7eb9b11841e7b9406fbab
# Parent b3bba126b04ab2f24274a1bcf5a224c6317c8e0d
Remove references to 'cloning by hardlink' from tests.
Mikael Berthe <mikael@lilotux.net> [Sun, 10 Jul 2005 16:15:20 -0800] rev 675
hg clone stored path fix
# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Node ID a08808d8ffd811c1174216c598da5c27d20bc2c9
# Parent b3bba126b04ab2f24274a1bcf5a224c6317c8e0d
hg clone stored path fix
The abspath() has been lost in changeset 634 (da5378d39269).
chad.netzer@gmail.com [Sun, 10 Jul 2005 16:14:56 -0800] rev 674
Make consistent use of str.startswith() in conditionals.
# HG changeset patch
# User chad.netzer@gmail.com
# Node ID 45db196de89a15fd045cd789f701b0180fd276f1
# Parent fafc16f705b6cb413897577b67918af55e1baafe
Make consistent use of str.startswith() in conditionals.
Andrew Thompson <andrewkt@aktzero.com> [Sun, 10 Jul 2005 16:14:41 -0800] rev 673
Change MANIFEST.in to recursive-include the contrib/ folder.
# HG changeset patch
# User Andrew Thompson <andrewkt@aktzero.com>
# Node ID e5dc09266c217bc50b91d710a045c679411e4727
# Parent c55df1c38618035c8e94e7af025e2b7f38f6d743
Change MANIFEST.in to recursive-include the contrib/ folder.
Now sdist picks up git-viz again.
Edouard Gomez <ed.gomez@free.fr> [Sun, 10 Jul 2005 16:14:28 -0800] rev 672
More IE friendly diff output related templates.
# HG changeset patch
# User Edouard Gomez <ed.gomez@free.fr>
# Node ID 6eee9b54c53c41643192c7920db642c984a00a21
# Parent 8b8f710bb65875d588044c3615cf42180aee23ff
More IE friendly diff output related templates.
I thought i could use CSS to render properly the diff blocks in IE.
But i was obviously too optmistic and didn't realized that IE only
renders preformated text for pre tag content...
So i had to rollback some of my changes to accomodate to this IE
bug/limitation. A diff blocks become pre tags, and diff lines
become span again. Hopefully, the pages continue validating.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 10 Jul 2005 16:14:06 -0800] rev 671
Move hgrc documentation out to its own man page, hgrc(5).
# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Node ID 5076cf1fd6a1b8eb410e5e03cb004ca6a52a30f9
# Parent 7369ec5d93f2ffd490a43970edd9adf8d2bbe269
Move hgrc documentation out to its own man page, hgrc(5).
The new man page expands on the existing documentation by describing
the file format and the purpose of each section and field.
Matt Mackall <mpm@selenic.com> [Sun, 10 Jul 2005 16:13:39 -0800] rev 670
Move .hg into ignore()
mwilli2@localhost.localdomain [Sun, 10 Jul 2005 16:03:20 -0800] rev 669
.hgignore speedups patch incorporating Matt's feedback.
# HG changeset patch
# User mwilli2@localhost.localdomain
# Node ID c78a9d4398c63b6bc689e456e1cab3850a846c8a
# Parent 8c89408a7154d2da94766e957a088407fd0fef93
.hgignore speedups patch incorporating Matt's feedback.
Edouard Gomez <ed.gomez@free.fr> [Sun, 10 Jul 2005 16:02:39 -0800] rev 668
Dont trap SIGHUP on the other OS
# HG changeset patch
# User Edouard Gomez <ed.gomez@free.fr>
# Node ID 34a547cb33fe515ef4cdc8ccd173546671253ae9
# Parent 8c89408a7154d2da94766e957a088407fd0fef93
Dont trap SIGHUP on the other OS
HG doesn't work anymore on the other OS since signals are trapped.
This is due to the fact that as explained in Python docs not all
signals are defined for all platforms, so python was complaning about
missing signal.SIGHUP.
mark.williamson@cl.cam.ac.uk [Sun, 10 Jul 2005 16:01:11 -0800] rev 667
A number of minor fixes to problems that pychecker found.
# HG changeset patch
# User mark.williamson@cl.cam.ac.uk
# Node ID 55d38977b7f2e73b8c1090179928ac96c8922b90
# Parent b3bba126b04ab2f24274a1bcf5a224c6317c8e0d
A number of minor fixes to problems that pychecker found.
Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl> [Sun, 10 Jul 2005 16:00:56 -0800] rev 666
hgeditor: Remove EMAIL default for HGUSER, comment editor selection
# HG changeset patch
# User Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl>
# Node ID a4c688c8273e392b1bf33cfc736e00ec752a415e
# Parent be12687d4bf0ce16c4207bef85c188de66efbf53
hgeditor: Remove EMAIL default for HGUSER, comment editor selection
HGUSER is already set to EMAIL by Python code if needed
Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl> [Sun, 10 Jul 2005 16:00:49 -0800] rev 665
hgeditor: Remove temporary files even if interrupted
# HG changeset patch
# User Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl>
# Node ID 1292f1fd015767d9682ba2ff5f8377fb6760c3a5
# Parent a4c688c8273e392b1bf33cfc736e00ec752a415e
hgeditor: Remove temporary files even if interrupted
Index: hg/hgeditor
===================================================================
Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl> [Sun, 10 Jul 2005 16:00:30 -0800] rev 664
hgeditor: Simplify manifest hash adding
# HG changeset patch
# User Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl>
# Node ID be12687d4bf0ce16c4207bef85c188de66efbf53
# Parent 341d27f865903223f8bf12382e3596167228a1c1
hgeditor: Simplify manifest hash adding
I hope no one will miss the colon.
Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl> [Sun, 10 Jul 2005 16:00:24 -0800] rev 663
hgeditor: Fix some parameters to commands
# HG changeset patch
# User Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl>
# Node ID 341d27f865903223f8bf12382e3596167228a1c1
# Parent 5c5d1484b51a53918575a199ab8985160f0ce2d7
hgeditor: Fix some parameters to commands
Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl> [Sun, 10 Jul 2005 16:00:17 -0800] rev 662
Pass username to hgeditor, remove temporary file
# HG changeset patch
# User Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl>
# Node ID 5c5d1484b51a53918575a199ab8985160f0ce2d7
# Parent 8c89408a7154d2da94766e957a088407fd0fef93
Pass username to hgeditor, remove temporary file
kreijack@inwind.REMOVEME.it [Sun, 10 Jul 2005 15:59:26 -0800] rev 661
Add rss tag in the changelog/filelog html template.
# HG changeset patch
# User kreijack@inwind.REMOVEME.it
# Node ID 20edcc82038fce8460076ca5723fbbb919016356
# Parent 8c89408a7154d2da94766e957a088407fd0fef93
Add rss tag in the changelog/filelog html template.
This patch add rss tags in the changelog/filelog template
html pages. This tags permit the browser to detect the rss feed.
Matt Mackall <mpm@selenic.com> [Sun, 10 Jul 2005 14:07:14 -0800] rev 660
Move commit hook after commit completes
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Move commit hook after commit completes
manifest hash: bc65b570af67ee4748efaba2ff8a6cddf91b8a14
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFC0ZwSywK+sNU5EO8RAuAjAJsHGTXsOCnxq+xbq/Q0H+ayGnzaiQCfdWn6
or+IWK3sjYILYncTxMFZJdE=
=mQb7
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Sun, 10 Jul 2005 14:06:30 -0800] rev 659
Whitespace cleanup
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Whitespace cleanup
manifest hash: 7abcbe23247dd5b7dea6fa44fb80d9f909cf6829
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFC0ZvmywK+sNU5EO8RAhhDAJ0YXOx5B2F/3NjFB+5YcUtkHqVyuQCgnNyp
tWbRrjDz/SbKz/tFAsxJDqo=
=xB66
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Sun, 10 Jul 2005 10:38:50 -0800] rev 658
Generate a friendlier except for failed lookups
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Generate a friendlier except for failed lookups
manifest hash: 1a4384b791bba2107604e56168166dfcbfb54086
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFC0Ws6ywK+sNU5EO8RArBGAJ9EA0mCNGqO+w6LaO358sVe19o7lQCdGffF
MmQ/ZIvxoJOjYTo+PLBWMqI=
=4VIg
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Sun, 10 Jul 2005 10:06:54 -0800] rev 657
dirstate.forget() takes a list
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
dirstate.forget() takes a list
manifest hash: e444474a5ac76d3562ee8c0211e1a88ec53155ef
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFC0WO+ywK+sNU5EO8RAlmYAJ9pcSgpvvuqLzfUkeApXZyOb3j6pQCgi9Te
e8ZI236WNWfyrwEASxFIeLM=
=yDVZ
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Sat, 09 Jul 2005 18:11:54 -0800] rev 656
Warn about bogus ignore expressions
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Warn about bogus ignore expressions
manifest hash: 7beb33a1f0879a1d2457953187a523417bc7a101
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFC0IPqywK+sNU5EO8RAsOdAJ0bFxZoUjSk/BxWZ9C50SlxlDBlBQCeKbu0
QVzZZKIFlDRVWOsi8zfamHA=
=zAVL
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Fri, 08 Jul 2005 18:10:57 -0800] rev 655
Fix out of range regression
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix out of range regression
From: Filip Brcic <brcha@users.sourceforge.net>
The old revlog.py issued "index out of range" error when cloning the repository
Now I have reverted the parts of revlog.py to the old state when prev was
initialized as -1 and later assigned self.tip() only if that is possible.
Previously prev was always initialized as self.tip() and that is where the
out of range error was.
manifest hash: c94c9aee8b6d382ef52c3981f306a6e7e5f4c4d1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCzzIxywK+sNU5EO8RAtlcAJ0TX9FXuC2c3YHuYXNwqZhdzPWUlgCggq+a
yJzUKDKH/gvnD3Tx3jcmCn8=
=euPi
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Fri, 08 Jul 2005 13:35:02 -0800] rev 654
Make cloning by hardlink quiet again
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Make cloning by hardlink quiet again
manifest hash: bd12b4deedb99e06415619f858b95b566a6d329e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCzvGGywK+sNU5EO8RAiCzAJ9iCRbyijLT7PqkgCI9eFn+9pl+KQCfdcB1
yHxfvLCL39wAAcBo6Hebpvo=
=qne+
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Fri, 08 Jul 2005 13:21:22 -0800] rev 653
Fix corruption resulting from skipping parts of a revision group
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix corruption resulting from skipping parts of a revision group
We were occassionally losing track of what revision a delta applied to
when we skipped over deltas we already had and applying the delta
against the wrong base. This could result in coredumps from mpatch,
consistency errors, or failed verify.
manifest hash: fcf20a8abfd81f08fae2398136b2ed66216b2083
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCzu5SywK+sNU5EO8RAi10AJ9cqIfQzOzbcdH36t1LR/rY+UMtHwCeM79p
Dtv+Jh0McLZr6nf4iJyhDgI=
=5o6U
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Fri, 08 Jul 2005 00:14:47 -0800] rev 652
Non-grouping regex for ignore
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Non-grouping regex for ignore
Suggested by Mark Williamson
manifest hash: dfd4686e7ac9f96e79da600edf299ed64213e05d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCzjX3ywK+sNU5EO8RAnc1AJ4/sKzyZJiRs6UzE3uksE2U9rOkVQCeJsZf
PhHsNtEt/WyL+v44mBfk8Mk=
=e+Qy
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Fri, 08 Jul 2005 00:07:54 -0800] rev 651
Fix an odd revlog bug
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix an odd revlog bug
If revlog had a cached -empty- revision, as opposed to no cached
version, it could get confused. This cropped up in verify on a
particular repo.
manifest hash: 90ccf122087f6bbcb4322cb9d9bb8124610ba886
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCzjRaywK+sNU5EO8RAgVEAKCv3WBJt1rBOX0UlTDXFPygPIru+gCfTZxJ
CEz1lYny1gkQ+haGY26QdBs=
=C/K5
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Fri, 08 Jul 2005 00:04:25 -0800] rev 650
Fix bug in reverting deleted files
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix bug in reverting deleted files
Force updates and reverts wouldn't restore deleted files in the
working dir. This should fix that.
manifest hash: e14809399bbc63da42e8c8f694cc8acf31e537f7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCzjOJywK+sNU5EO8RAqVLAKCC1BF6JhNiO6n4LJGvy9RBTgOelwCdF9Tr
sADRnovYt9xSnUGmd1Om9JQ=
=SdcP
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Thu, 07 Jul 2005 09:41:03 -0800] rev 649
Experimental ignore regex speed-up
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Experimental ignore regex speed-up
manifest hash: c6922086fb78201b60ba8cbde5b51512225ebcc8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCzWkvywK+sNU5EO8RAohzAJ9BwkFJQzs0QRH71r1Y1Wm0QCSmEwCgrESQ
Ej3Kt/y0JdhOJzQLsAiufqk=
=SPjY
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2005 22:41:56 -0800] rev 648
Attempt to read all remaining remote output at close
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Attempt to read all remaining remote output at close
manifest hash: e1eda33686726559849388b048a838933862fe89
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCzM60ywK+sNU5EO8RAudsAJwPW/MPUBXFV13UbYmZyiwdzSr8QwCfYJqc
l1ZDWPZPTN5UGUlfs0CCu7Y=
=2Tat
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2005 22:37:06 -0800] rev 647
update test-hup permissions
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
update test-hup permissions
manifest hash: a041df3958fb7508e34ce7c736c196217bbcf8a7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCzM2SywK+sNU5EO8RAnKvAKC1+ilD53KpBwplk5iaUMra4h3GDgCgsM4f
R+RswPBjW8I51vNyvZ45AvM=
=dQjV
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2005 22:30:00 -0800] rev 646
Show remote client output with "remote:"
kreijack@inwind.REMOVEME.it [Wed, 06 Jul 2005 22:28:50 -0800] rev 645
this patch permits hgweb to show the deleted files in the changeset diff
# HG changeset patch
# User kreijack@inwind.REMOVEME.it
# Node ID 08b33970007e753f12b2b2f9d0e169981a6e8c3c
# Parent 7369ec5d93f2ffd490a43970edd9adf8d2bbe269
this patch permits hgweb to show the deleted files in the changeset diff
mason@suse.com [Wed, 06 Jul 2005 22:28:35 -0800] rev 644
Performance enhancements for manifest.add()
# HG changeset patch
# User mason@suse.com
Performance enhancements for manifest.add()
Improve manifest.add performance by using bisect to insert/remove
changed items into the manifest list. This also generates the
manifest delta directly based on the changes being made.
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2005 22:27:53 -0800] rev 643
typo in help message.
From: "Aneesh Kumar K.V" <aneesh.kumar@hp.com>
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2005 22:27:25 -0800] rev 642
Update tests
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2005 22:27:07 -0800] rev 641
Catch SIGHUP
This should reduce the chance that a repo we're connected to via ssh
gets interrupted without doing rollback.
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2005 22:25:40 -0800] rev 640
Switch push over to the new scheme
Now push works transparently with any repo with lock and
addchangegroup. Currently this is local repos and ssh.
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2005 22:23:57 -0800] rev 639
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2005 22:23:27 -0800] rev 638
Add a scheme for handling remote locking
This adds an object that remembers to unlock the remote repo on
destruction and lock/unlock functions for the ssh protocol. The remote
repository should also unlock itself when the connection goes down.
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2005 22:21:23 -0800] rev 637
Fix up the broken bits in findoutgoing
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2005 22:20:56 -0800] rev 636
Move the empty changeset detection out of findincoming to pull
This lets us reuse findincoming for findoutgoing
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2005 22:20:12 -0800] rev 635
Protocol switch from using generators to stream-like objects.
This allows the the pull side to precisely control how much data is
read so that another encapsulation layer is not needed.
An http client gets a response with a finite size. Because ssh clients
need to keep the stream open, we must not read more data than is sent
in a response. But due to the streaming nature of the changegroup
scheme, only the piece that's parsing the data knows how far it's
allowed to read.
This means the generator scheme isn't fine-grained enough. Instead we
need file-like objects with a read(x) method. This switches everything
for push/pull over to using file-like objects rather than generators.
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2005 22:14:10 -0800] rev 634
Add a repo method to report repo device
This is used to establish whether repos are on the same device for
hard linking. Remote repos all return -1.
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2005 22:11:54 -0800] rev 633
Slim down and update README a bit
thananck@yahoo.com [Tue, 05 Jul 2005 18:23:56 -0800] rev 632
Provides output option to cat command
# HG changeset patch
# User thananck@yahoo.com
# Node ID c838b9c2c71b1d64b8bde786f6470b30f23962de
# Parent 7369ec5d93f2ffd490a43970edd9adf8d2bbe269
Provides output option to cat command
expand function in commands.doexport is moved to toplevel and renamed
to make_filename. The 'cat' command now accecpts --output <pattern>
switch to specify the destination file.
Index: hg/mercurial/commands.py
===================================================================
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Tue, 05 Jul 2005 18:23:34 -0800] rev 631
Update documentation of hg tag
# HG changeset patch
# User Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
# Node ID 8fc9bfabae06cba91b05c265545bcce2654dab2f
# Parent 7369ec5d93f2ffd490a43970edd9adf8d2bbe269
Update documentation of hg tag
This updates the FAQ, manpage and adds hg tag to the list of commands
in README.
Index: hg/README
===================================================================
Bryan O'Sullivan <bos@serpentine.com> [Tue, 05 Jul 2005 18:22:28 -0800] rev 630
Remove debug print from locate code.
# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Node ID 5240abb57899b745f2e6465be29d9d54c4777364
# Parent 13b74665cbdf735a91f231956d0fe73e446340ea
Remove debug print from locate code.
Index: hg/mercurial/commands.py
===================================================================
Bryan O'Sullivan <bos@serpentine.com> [Tue, 05 Jul 2005 18:22:22 -0800] rev 629
Clarify man page entry for locate a little.
# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Node ID 13b74665cbdf735a91f231956d0fe73e446340ea
# Parent fb74eaa2b5b763ad5591b2e51dbb377bf8342064
Clarify man page entry for locate a little.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 05 Jul 2005 18:19:22 -0800] rev 628
Use repo.getcwd() in a few obvious places.
# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Node ID fb74eaa2b5b763ad5591b2e51dbb377bf8342064
# Parent ebf5eba347a17a5c09000b3342caf350cd060a1b
Use repo.getcwd() in a few obvious places.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 05 Jul 2005 18:19:01 -0800] rev 627
Add locate command.
# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Node ID ebf5eba347a17a5c09000b3342caf350cd060a1b
# Parent d2994b5298fb20f87dc1d4747635b280db3c0526
Add locate command.
Used for finding files with names that match specific patterns,
such as "*.c".
This patch also introduces localrepository.getcwd, which returns the
current directory relative to the repository root.
Matt Mackall <mpm@selenic.com> [Tue, 05 Jul 2005 18:15:38 -0800] rev 626
Fix quoting for RSS links
Spotted by Mikael Berthe <mikael.berthe@lilotux.net>
Matt Mackall <mpm@selenic.com> [Tue, 05 Jul 2005 18:12:57 -0800] rev 625
Cleanups for repo.pull
Use repo.pull in pull and clone commands
Teach clone about ssh:// (temporarily)
Fix up shutil issue on failed pull
Matt Mackall <mpm@selenic.com> [Tue, 05 Jul 2005 17:55:22 -0800] rev 624
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com> [Tue, 05 Jul 2005 17:50:43 -0800] rev 623
Change remote repository to httprepository
Matt Mackall <mpm@selenic.com> [Tue, 05 Jul 2005 17:50:02 -0800] rev 622
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com> [Tue, 05 Jul 2005 17:49:01 -0800] rev 621
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com> [Mon, 04 Jul 2005 15:42:26 -0800] rev 620
Attempt to handle RSS URIs properly
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Attempt to handle RSS URIs properly
manifest hash: 1546939c11a8640ca56f0b0f5c7bdc878b4faa67
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCycliywK+sNU5EO8RAukgAJ9eoJdqTiTQ8xSsSeHMIBmHnnQk9QCfQpFL
SAJKUYknvv4IJDUyHjQc61k=
=zGdJ
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Mon, 04 Jul 2005 12:54:42 -0800] rev 619
update tests
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
update tests
manifest hash: 70079385599132ca8f90582e1f9317ca46167532
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCyaISywK+sNU5EO8RApnGAJ0blIxE0tKPzcRQUDAHCLe5KmUSNgCgjGoA
kV4Os9FG1NmGaCysPIsKwts=
=Ee67
-----END PGP SIGNATURE-----
Bryan O'Sullivan <bos@serpentine.com> [Mon, 04 Jul 2005 12:39:35 -0800] rev 618
Handle unrecognised options correctly.
# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Node ID 837a023781a0228e5791e8e278129d2d54d13f99
# Parent d2994b5298fb20f87dc1d4747635b280db3c0526
Handle unrecognised options correctly.
thananck@yahoo.com [Mon, 04 Jul 2005 12:39:21 -0800] rev 617
open .hgtags as binary
# HG changeset patch
# User thananck@yahoo.com
# Node ID 2bd20bb06f817796d76b8e126f4a685426c4faf4
# Parent 7a240687674e6cf5a8dfd45973d7e3978b89af79
open .hgtags as binary
The '.hgtags' file, in tag command, is opened as binary for interoperability with the other OS
maf46@burn.cl.cam.ac.uk [Mon, 04 Jul 2005 12:38:34 -0800] rev 616
Fix zombie files in merge
# HG changeset patch
# User maf46@burn.cl.cam.ac.uk
# Node ID 57667c9b93a5a743e4629d15a0e6bd76699130c3
# Parent d2994b5298fb20f87dc1d4747635b280db3c0526
Fix zombie files in merge
Keir Fraser observed the following:
> I made a small test case that illustrates the bug in merging changesets
> with 'hg remove's in them:
>
> 1. Create a repository A containing files foo & bar.
> 2. Create clone called B.
> 3. A removes file bar, and commits this removal.
> 4. B edits file foo, and commits this edit.
>
> Now, if B:
> # hg pull ../A; hg update -m; hg commit
> Then bar remains deleted.
>
> If A:
> # hg pull ../B; hg update -m; hg commit
> Then bar is resurrected!
>
> It looks as though, when you merge across a branch, any deletions in
> your own branch are forgotten.
> ...
> Fixing this is a must, as zombie files are a real pain. :-)
Keir later patched our local copy of hg as shown below, which fixes
the problem. I've also enclosed a test which captures the test Keir
outlined...
Files deleted on a branch should not automatically reappear in a merge
Patch notes:
1. The first chunk does not change behaviour, but cleans up the code
to more closely match check of 'force' in the second chunk. I
think it makes the code clearer.
2. The second chunk fixes two bugs --
i. If we choose to keep a remotely-changed locally-deleted file,
then we need to 'get' that file. If we choose to delete it
then no action need be taken (it is already deleted in the
working manifest). Without this fix, choosing to delete would
get a Python traceback.
ii. The test for whether the file was remotely-created is
insufficient. It is only true if f is not in the common
ancestor. Otherwise the file was deleted locally, and should
remain deleted. (this is the most important fix!)
Index: hg/tests/test-merge6
===================================================================
thananck@yahoo.com [Mon, 04 Jul 2005 12:22:21 -0800] rev 615
Output file of 'export' is opened as binary (other OS)
# HG changeset patch
# User thananck@yahoo.com
# Node ID 7a240687674e6cf5a8dfd45973d7e3978b89af79
# Parent d2994b5298fb20f87dc1d4747635b280db3c0526
Output file of 'export' is opened as binary (other OS)
Matt Mackall <mpm@selenic.com> [Mon, 04 Jul 2005 12:18:58 -0800] rev 614
Stop patch description import at diff -r
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Stop patch description import at diff -r
manifest hash: cc269f69c26ad4fba1fdaeefe2dc8191a0669fe0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCyZmyywK+sNU5EO8RAkODAJ9d/JYpBOZiOcQxlz0n2VtIPtK/IgCgl2Lj
caGbq4yn4RxzBQqqIoQzOTQ=
=9fHy
-----END PGP SIGNATURE-----
Bryan O'Sullivan <bos@serpentine.com> [Mon, 04 Jul 2005 12:16:27 -0800] rev 613
Demand-load most modules in the commands and ui modules.
# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Node ID 059c6e42fc4221816e26a72bef8cf780891989ca
# Parent d2994b5298fb20f87dc1d4747635b280db3c0526
Demand-load most modules in the commands and ui modules.
This improves response times for a number of simple commands, as the
Python interpreter doesn't end up loading modules that it never uses.
There's less benefit to demand-loading in other modules.
Alecs King <alecsk@gmail.com> [Mon, 04 Jul 2005 12:15:44 -0800] rev 612
On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
# HG changeset patch
# User Alecs King <alecsk@gmail.com>
On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
> On Sun, Jul 03, 2005 at 12:49:27AM +0800, Alecs King wrote:
> > Hg is really very nice. The only feature i miss from git is the
> > whatchanged -p, which shows a diff along with a changeset.
> > python before, i just dig into the mercurial/commands.py a while and
> > see what diff(), dodiff(), export(), show_changeset(), log() would
> > normally do. There might be one thing or two missed or wrong. But here
> > it is: a '-d' option to 'hg log' showing the diff info. You can use 'hg
> > log -d' to show the whole history with the diff or 'hg log -d <file>' to
> > show that info of a particular file. And also works with the '-r'
> > option.
>
> Let's use -p. We're going to be combining the global and per command
> switch namespace shortly and the global -p will disappear.
Okay. '-d' changed to '-p'. Just like 'whatchanged -p', now we have
'hg log -p'.
> Also, the argument list for show_changeset is getting a bit unwieldy.
This time i remain show_changeset untouched at all. Only changed some
bits of log().
shaleh@speakeasy.net [Mon, 04 Jul 2005 11:20:20 -0800] rev 611
* clean up error handling when user requests to use a non file object
# HG changeset patch
# User shaleh@speakeasy.net
# Node ID 1ae21732349f5b6dba2941609a044d9c365a6fb2
# Parent 94744f6fe0e7c19b10fab7eb24249f3eeaa5489a
* clean up error handling when user requests to use a non file object
- use os.path.exists() to verify the item exists
- use os.path.isfile() to check whether the item is a file or not
diff -r 94744f6fe0e7 -r 1ae21732349f mercurial/hg.py
shaleh@speakeasy.net [Mon, 04 Jul 2005 11:06:01 -0800] rev 610
check export options for changeset before running
# HG changeset patch
# User shaleh@speakeasy.net
# Node ID 0cc64f4312540b2081c76dc589cc825d734676d8
# Parent f7bfe827ea381afc89f486b2d93d7f4fe86de04d
check export options for changeset before running
diff -r f7bfe827ea38 -r 0cc64f431254 mercurial/commands.py
Matt Mackall <mpm@selenic.com> [Mon, 04 Jul 2005 11:00:25 -0800] rev 609
[PATCH] hg tag: local tag support in file .hg/localtags
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] hg tag: local tag support in file .hg/localtags
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
Support local tags in .hg/localtags
Also minor cleanups in related functions
manifest hash: 553b2e896fed3c9055ed18482ce15cfaa4fc41ce
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCyYdJywK+sNU5EO8RAhohAKC2I3U44EXi+k4ofo5AWHBOg+94bgCfcbzs
VQ2yWkPPHZycjtswOBmepa8=
=v5AX
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Sun, 03 Jul 2005 21:51:09 -0800] rev 608
Add username/merge/editor to .hgrc
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Add username/merge/editor to .hgrc
These take priority over the equivalent environment vars
Deprecate HGMERGE, HGUSER, and HGEDITOR in docs
Add ui section to docs
Remove undocumented HG_OPTS
Raise username code out of changelog class
Make tests ignore ~/.hgrc
manifest hash: d127ef02bc5266036b4c77a55319519e91bd475b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCyM5NywK+sNU5EO8RAuU7AJ9zKk1TFrJXHM04jOOJJeBSp8jlTgCeP+tr
qwGFd+WaNqTepZ0wun5g9Uc=
=QEBu
-----END PGP SIGNATURE-----
mpm@selenic.com [Sun, 03 Jul 2005 21:14:40 -0800] rev 607
[PATCH] Parse and use header data from an hg export'ed changeset
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Parse and use header data from an hg export'ed changeset
From: Andrew Thompson <andrewkt@aktzero.com>
This should make it easier to import changesets that are hg export'ed
from other Mercurial users:
Add a routine to catch the user from an hg export'ed changeset.
Add user to commit call.
Add trap for changelog snippet, which is promoted to the beginning of
the commit text.
manifest hash: cf5b068f4cec411ff8b9fa3db324ab44ed012778
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCyMXAywK+sNU5EO8RAqk5AJ9rC4ZwzcpDfxrNqIBrrTj6eL2mzQCgmZ5O
wSkis2J9Xz2wOZAhjVcxIgQ=
=32D+
-----END PGP SIGNATURE-----
mpm@selenic.com [Sun, 03 Jul 2005 20:52:41 -0800] rev 606
[PATCH] Fix thinko in "serve" man page entry.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Fix thinko in "serve" man page entry.
From: Bryan O'Sullivan <bos@serpentine.com>
manifest hash: 38873ef90d0a418810fe6bb9d4b8357b63e88cc3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCyMCZywK+sNU5EO8RAhKuAKCjqdqGs1OiU+urYjYGC+nVYFpIygCfd/UC
Ln4/JF5J87nN/bHPKKQ2uh4=
=wFAq
-----END PGP SIGNATURE-----
mpm@selenic.com [Sun, 03 Jul 2005 20:51:05 -0800] rev 605
[PATCH] Get "hg serve" to optionally log accesses and errors to files
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Get "hg serve" to optionally log accesses and errors to files
From: Bryan O'Sullivan <bos@serpentine.com>
Get "hg serve" to log accesses and errors to files.
manifest hash: 573ef524d84cc7d2777f5fd982f2ef47f4bcf668
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCyMA5ywK+sNU5EO8RAp1eAJoD6Qqy6XcGInzZKdo0Qp7gLttYzACfRywL
fSGapmCAIaZPoBvoxXTk8Zo=
=ZicU
-----END PGP SIGNATURE-----
mpm@selenic.com [Sun, 03 Jul 2005 20:49:48 -0800] rev 604
Split wrapped demandload line
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Split wrapped demandload line
manifest hash: e562d8b7e2c66c83dfc8a09c503edb1dac0fe997
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCyL/sywK+sNU5EO8RApE9AJwKG7SYhyT3uDteHecQKJPMm+nuAgCglKNp
MDDX+bOSNQMhCyAH83CuzRw=
=MpjC
-----END PGP SIGNATURE-----
mpm@selenic.com [Sun, 03 Jul 2005 20:47:29 -0800] rev 603
[PATCH] Get "hg serve" to print the URL being served
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Get "hg serve" to print the URL being served
From: Bryan O'Sullivan <bos@serpentine.com>
If invoked with verbosity, print the URL at which we are serving.
Useful if you bind to any port with "-p 0", and need to know what port
the server is listening on.
manifest hash: d317225606fbd2ec5819e1f266575b0485dfba79
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCyL9hywK+sNU5EO8RAjFQAJoDBRl5VoGIklxA1PdFGCt8Jb3iMQCeILeD
XAwnnSCy/IQ/MDfYf6z7oWI=
=FNVC
-----END PGP SIGNATURE-----
mpm@selenic.com [Sun, 03 Jul 2005 20:33:35 -0800] rev 602
Various HTML cleanups
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Various HTML cleanups
From: Edouard Gomez <ed.gomez@free.fr>
Cleaned up the changeset summary table differentiating title cells
from data cells using th and td. Added semantic classes.
Changed the big pre tag into a div that mimics pre tag style
(that is monospace font and white space preformated). This is
required because pre is an inline element, and thus cannot
be the parent of block elements as div (diffblock). I replaced
all these div blocks by a series ul lists as patches can be
seen as lists of changes in versioned files.
If someone has a better semantic to propose, i'd be pleased he
drops me an email about this patch.
- --
Cleaned up the filediff summary table differentiating title cells
from data cells using th and td. Added semantic classes.
- --
Keep style unchanged for changeset template
As promised no changes in style. This one got through my eyes
+ brain checking... sorry.
manifest hash: 68dd5c1ac71aa6a5932fb209d48df5fc0c78643b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCyLwfywK+sNU5EO8RAtE9AJ0cxl80eF3zpBWLn8OkoSs7dkZOTgCgtYto
j7T/iRk0Hq4Q0mjdos7FvYU=
=KOP2
-----END PGP SIGNATURE-----
mpm@selenic.com [Sun, 03 Jul 2005 20:21:37 -0800] rev 601
Add globals to templater/fixup RSS
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Add globals to templater/fixup RSS
This removes a bunch of duplicate header() and footer() bits and makes
url and reponame available to all templates.
Fix up RSS bits to use url
Fix strftime call
manifest hash: 63e616e4c7f517a630d80429336817d64e900b68
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCyLlRywK+sNU5EO8RAj9IAJkBDzMQaOwRmF0q8tRmVRnzHCjShACfSTCj
dbfAWg1crv/mUuRZlWL6Tc4=
=Z331
-----END PGP SIGNATURE-----
mpm@selenic.com [Sun, 03 Jul 2005 20:10:21 -0800] rev 600
Simplify RSS date generation
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Simplify RSS date generation
manifest hash: 3b1628aaee450c292949f6d079b4a05ccb5ce6ab
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCyLatywK+sNU5EO8RAiLMAKCqYFyzSDCU6Wm34LSWZroAHMqa4QCfSWv6
jh/vvuQS0qmXybm6Ivd7XVY=
=x1Rf
-----END PGP SIGNATURE-----
mpm@selenic.com [Sun, 03 Jul 2005 13:32:59 -0800] rev 599
[PATCH] Add RSS support to hgweb
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Add RSS support to hgweb
From: Goffredo Baroncelli <kreijack@libero.it>
with the two small patches below, now hgweb can act as feed source.
Two kinds ofobjects can be tracked: the changelong and the files. This
can be useful if anyone would track the changes of a file ( and
because git has it, mercurial have to has ).
To check the changelog the url is
http://127.0.0.1:8000/pippo.pluto?cmd=changelog;style=rss
To check a file ( the mercurial/hgweb.py for examples ) the url is
http://127.0.0.1:8000/?cmd=filelog;file=mercurial/hgweb.py;filenode=0;style=rss
The first patch adds a new filter for the template: the filter is
named rfc822date, and translates the date from the touple format to a
rfc822 style date. The second patch adds the templates needed to
create the rss pages.
Tested with akgregator ( kde ).
[tweaked by mpm:
add Content-type: text/xml
add support for URL to header()
add header with link and content type
add RSS links on the normal pages]
manifest hash: 170c03d50490d7160097f59abdde1a5073d2ba82
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCyFmLywK+sNU5EO8RApkrAKCYF/vZ3DwdMXPBds2LxGEX8+tK5QCfTeOc
ZhPN8Xjt2cD3wMbNXMcoNSo=
=COlM
-----END PGP SIGNATURE-----
mpm@selenic.com [Sun, 03 Jul 2005 12:29:37 -0800] rev 598
[PATCH 4/5]: cleaning the template parent management in hgweb
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH 4/5]: cleaning the template parent management in hgweb
From: Goffredo Baroncelli <kreijack@libero.it>
Now the patch remove every use of the tag p1/p2/p1rev/p2rev from the
code ( even+the ones not used ), replacing everywhere with the tag
parent ( even where the previous +tag are not use ), so the
information to the templates is still given.
manifest hash: ede1f299e9201fdad2ecf48e63314350acbb047e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCyEqxywK+sNU5EO8RAjc5AJ9o8AU6/YRuERblO/0kgWwDN4rqQQCgkVj/
UBtzW5x0yD65mK6rb4f+bQk=
=07yG
-----END PGP SIGNATURE-----
mpm@selenic.com [Sun, 03 Jul 2005 12:26:45 -0800] rev 597
[PATCH] use <arpa/inet.h> instead of <netinet/in.h> for ntohl/htonl
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] use <arpa/inet.h> instead of <netinet/in.h> for ntohl/htonl
From: Jed Davis <jdev@panix.com>
This fixes the Mac OS X build problem; hopefully it won't break any
other OSes, especially since SUSv3 says arpa/inet is the right header.
( http://www.opengroup.org/onlinepubs/009695399/functions/ntohl.html )
manifest hash: 2f06ff0cffefdb35e794131afcd1f34f9fdfa5cf
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCyEoFywK+sNU5EO8RAk6WAJ9v/pnr07zUXKM9EBQQGaKSZAlhxACdHrwS
XTLSL6pPGAwaRfExGF2A3DQ=
=Rtv9
-----END PGP SIGNATURE-----
mpm@selenic.com [Sun, 03 Jul 2005 11:47:45 -0800] rev 596
A bunch of parsing/help updates
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
A bunch of parsing/help updates
more explanation of how to get non-basic commands
shorten names of debug functions and add docstrings
add undo long docstring
promote anotate, export, and revert
make the global opts array global
refactor parsing
kill two unused arguments to fancyopts
update test-help
manifest hash: 459ae2273aaf54f71b4576677a681dc53ab2908c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCyEDhywK+sNU5EO8RAr0DAJ9LTu8Fc2quLRtuwLPTQzWqlOJWKwCbBpZk
pnMkYnshsutVYljcil1P46I=
=Sleg
-----END PGP SIGNATURE-----
mpm@selenic.com [Sun, 03 Jul 2005 11:41:43 -0800] rev 595
Expand undo docs
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Expand undo docs
manifest hash: 4381a35ef96ce10176dde3c9c6c2503f65ae8a09
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCyD93ywK+sNU5EO8RAianAJ97+hYOTwV3OvAAekcYn3f1Ahzf4ACeLjgz
kUAHrjSmhs2F421lXxbgCfw=
=gbg9
-----END PGP SIGNATURE-----
mpm@selenic.com [Sun, 03 Jul 2005 11:41:24 -0800] rev 594
Update CONTRIBUTORS
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Update CONTRIBUTORS
manifest hash: 71ba14cae4b50532d09de7ca49bc67375a69161d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCyD9kywK+sNU5EO8RAqbuAKCeP12TfqkADk+xAKy04U78TmHJKgCfeZIg
qPwEtFA8Qd0l96fjJmL+peM=
=f6lv
-----END PGP SIGNATURE-----
mpm@selenic.com [Sun, 03 Jul 2005 03:58:05 -0800] rev 593
Shorten help
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Shorten help
Basic commands are now marked with "^" in the table
only basic commands are show in hg help by default
copyright banner not displayed with help by default
manifest hash: 7337678588354ca669a3b13d1fbb0ad893563947
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCx9LNywK+sNU5EO8RAokCAJ9ZK2sGEto9RLyukFX+n0nzHRoB9QCfU84I
e+Evc2g91kSS92FPrIC+Hnw=
=yUmt
-----END PGP SIGNATURE-----
mpm@selenic.com [Sun, 03 Jul 2005 03:33:48 -0800] rev 592
Restructure option handling
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Restructure option handling
This allows global options to appear before or after the command name
Also includes a patch from Andrew Thompson <andrewkt@aktzero.com> to
catch invalid global options.
manifest hash: 2a1285c0caf04ae79dca10cb899d183d84a6f3d4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCx80cywK+sNU5EO8RApJSAJ9U6ijOIbMDAd4lcahY6dXCTPcsNACeKuNT
iVhCp9IvacwwuHjAFXsLJEQ=
=Q9Qe
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 22:54:35 -0800] rev 591
options: kill -d for debug
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
options: kill -d for debug
You must now use --debug.
This is a preparatory step for changing the option parsing from:
hg [global-opts] <command> [command-opts]
to
hg [global-opts] <command> [global or command opts]
manifest hash: ec5ecc687340baa109a98b742f1cd8d1f4aadeed
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCx4urywK+sNU5EO8RAl90AJ0fwKU/GwHpJvlTFl5naeJbkceWewCgh4jK
kaTSSodACgPzgbFiid5RL4Y=
=siEe
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 20:51:33 -0800] rev 590
hg revert should revert to parent, not to tip
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
hg revert should revert to parent, not to tip
manifest hash: b6b622d0316f9f7ef60e500fb73844a4b0ad7b69
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCx27VywK+sNU5EO8RAnpHAKC1H3GAPC5wYlgpJG7Z7rWPl+vblQCeKVsz
UCjkaDw40evLbltWoY24xQs=
=dmvS
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 19:57:47 -0800] rev 589
[PATCH] bring MANIFEST.in up to date
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] bring MANIFEST.in up to date
From: Andrew Thompson <andrewkt@aktzero.com>
Some files were not coming over when I did python setup.py sdist
I included MANIFEST.in for completeness, but I'm not sure if it should
be in there.
manifest hash: 9e055bea2829035685f8a4a9aaf07ee3f9785e1d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCx2I7ywK+sNU5EO8RAl0EAJ9hwuKskuBwcSM46hqZY30JkMq8swCgnQVI
9FeppaKIUC3z2YMzhFHxRUQ=
=3xJV
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 19:49:46 -0800] rev 588
[PATCH] hg revert
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] hg revert
From: Bryan O'Sullivan <bos@serpentine.com>
Add revert command.
manifest hash: 0094e6bf421f34bd0492a33f95400b1b095a6bdc
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCx2BaywK+sNU5EO8RAigMAKCrvgTtIDuirCsMVlbiTMqaJy3UNgCdEcTL
hMN1X8FZi6sH+NjUdr9sYBg=
=i58L
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 19:44:35 -0800] rev 587
TODO tidy
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
TODO tidy
manifest hash: 04cb69f34ab0725c56abe8f26c3c3df240cc6569
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCx18jywK+sNU5EO8RAiVpAJsHdJ5aBd7K1l3mI4cK/wjJ7JC1CgCfUpMS
SY4h+IVdtWbH27Ra0DaT27w=
=XF3q
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 19:16:51 -0800] rev 586
[PATCH] Tags template cleanup
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Tags template cleanup
From: Edouard Gomez <edouard.gomez@gmail.com>
Tags template cleanup
This page lists all tags, thus using divs doesn't structure well
the information. Better use a list (ul). Each tag becomes a li
element. The li element also carries the parity information.
As font style tags are highly deprecated in newer HTML variants
get rid of the tt element, relaced by a simple span that gets
a CSS class that mimics tt default style (monospaced text)
Added CSS classes required to match old style.
manifest hash: f8943b8270e20966a04111e7205deefedd8b7075
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCx1ijywK+sNU5EO8RAjaAAJoCVaD37YUC6DueL6Kd5D9aoCF8bQCfSWw0
xFVkpEtnr6ST4eyJjR8K17U=
=nphb
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 19:15:05 -0800] rev 585
[PATCH] Changelogentry template cleanup
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Changelogentry template cleanup
From: Edouard Gomez <edouard.gomez@gmail.com>
Changelogentry template cleanup
Removed unuseful outside div (was probably used to carry the
parity class, it's no use, multiple css classes can be assigned
to the inner table instead)
Removed all hardwired styles in html tags. The style has been
externalized to equivalent CSS classes.
The inner table is now assigned the parity CSS class.
Changed all relevant table cells from td to th.
Added classes to all cells in order to give some semantic rationale
to these table cells.
manifest hash: 2835217df09be445961b865be166c2470173ba58
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCx1g5ywK+sNU5EO8RAhKGAKCWAHrx+lLMAXjd4/vgvG7vmfSkAACfTZ+m
/EyUsDVaYeVcGzFsp8liReI=
=vt2N
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 19:13:33 -0800] rev 584
[PATCH 2] ChangeLog template conformance fixes.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH 2] ChangeLog template conformance fixes.
From: Edouard Gomez <edouard.gomez@gmail.com>
# HG changeset patch
# User ed.gomez@free.fr
# Node ID e0661b00c613fa2bf1b670db1c9097423b4a107f
# Parent b2e9146c237d84a1dd24af9a08bfb031bcc3a523
ChangeLog template conformance fixes.
As per: http://www.w3.org/TR/html401/interact/forms.html#h-17.3
form element MUST have action attribute
As per: http://www.w3.org/TR/html401/interact/forms.html#h-17.4
input has no length attribute, replace by size (i don't couple this
with maxlength because a tag may be used in future versions and no
length limit might be required ?).
manifest hash: c8dccb4805167a47f159094fc5f57500caec4951
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCx1fdywK+sNU5EO8RAliGAJ4iBaSn2D9rRXVmreEYUwNvDyxMlQCeLxMU
HcVHU0wRJDAbiXngOINk7GA=
=FyPC
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 19:10:14 -0800] rev 583
[PATCH] Hide style from non conformant agents
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Hide style from non conformant agents
From: Edouard Gomez <edouard.gomez@gmail.com>
Hide style from non conformant agents
manifest hash: a5bab168fece5c570b84987faee8eed944ce3fab
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCx1cWywK+sNU5EO8RAm9LAKCcVq6I71gE+SR97ebX4hgm3+1L6QCgtUF6
qWADsVpZhU5xVipYn0SpE9Y=
=btY1
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 18:57:59 -0800] rev 582
Remove all remaining print statements
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Remove all remaining print statements
Convert most prints to ui.warn or ui.write
Pass a write function into transactions
manifest hash: d1b0af7a344fc087a5acfe3ae87b782c20d043e0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCx1Q3ywK+sNU5EO8RAqSTAJwM5t/m+JOlf2ZXOjuItCSdFiubcwCdFm3G
HoicikSYpTgfCj2pIRfyLjo=
=Loqo
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 18:31:13 -0800] rev 581
Fix up test-help for export
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix up test-help for export
manifest hash: a178ced2f645770d11c88261489dd8e8d876d94c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCx03xywK+sNU5EO8RAs1sAKCNgjEvBkGKaLi//pRy+NyNoDYKgQCghd6F
RA+ydCpNoC9k2fvge29c8fc=
=DoKn
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 18:29:54 -0800] rev 580
[PATCH] New export patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] New export patch
From: Bryan O'Sullivan <bos@serpentine.com>
Modify export command to accept rev ranges and output file spec.
It can now export a range of revisions, and print exported patches
to files whose names are generated using format strings.
manifest hash: e0085c205cdc31a168bcd25c85772ef00d53031d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCx02iywK+sNU5EO8RAtCKAJ0V2K9+i1OGa27KyC5/nq3m+OdvtgCgpnav
3vfEODMzJVOZoJt9wzI1UCg=
=YAdI
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 18:25:15 -0800] rev 579
Actually warn on pulling from an unrelated repository
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Actually warn on pulling from an unrelated repository
add some comments to findincoming
track the base nodes of the fetch set
report if the base set only contains nullid
add a test case
manifest hash: 3fc038a6041b0967a20503f5ec8876efc038841a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCx0yLywK+sNU5EO8RAlK6AJ9J/GKPpYSMzTqmguXPWOISJ+zY5gCghd+j
ClLpn0dKZnB46dh0F8zhuuk=
=emNb
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 15:38:16 -0800] rev 578
Remove empty directories on update
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Remove empty directories on update
manifest hash: 113969ec14c75eb9e1013b23cf096f722932b84d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxyVoywK+sNU5EO8RAklKAKCzSUhuFClkHN85qlnDp5iVscZbtgCeJVwx
dqaqG20GjPMWBg0d1ggI/ro=
=o2Uv
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 15:34:23 -0800] rev 577
Remove -p global switch in preparation for combining namespaces
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Remove -p global switch in preparation for combining namespaces
manifest hash: 88b5d17097aababa5c2c9242deba51598b207e3c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxyR/ywK+sNU5EO8RAvPbAJ0XtMA5E1y71hrx9ahBxU3sys98LwCghnz/
xks9tYPTnG8aizwEmg68EGw=
=5MkD
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 15:21:22 -0800] rev 576
Handle unknown files better on update
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Handle unknown files better on update
If we spot an unknown file that's identical to one that's in the
update, we get the updated one so that it shows up in the dirstate
properly.
manifest hash: 988aca64f255df67c27d1c6f8694ea098e4ec159
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxyFyywK+sNU5EO8RAjmiAKCTgINXMPB1CxHt0OgHYPucfjCS7QCcDpJJ
VgKqZS54hTAWN3jL2yllUhI=
=iPQD
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 13:40:15 -0800] rev 575
More whitespace cleanups
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
More whitespace cleanups
manifest hash: 6721a7b11295e0127386b080fd7a7b516ebced74
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxwm/ywK+sNU5EO8RAnl+AKCg/7ZCW7zIoG0nefksZzgLzgNmFACgnAFz
ZkW0LyZcU/hkFgXoGwo7ktk=
=AW+0
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 13:39:40 -0800] rev 574
Update test-diffdir output
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Update test-diffdir output
manifest hash: cd0fb3a3708897fe959852c48de1804fb0b74bf4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxwmcywK+sNU5EO8RAlRCAJ9SBrMQLSRVY1j3V1YO25dGbIN18QCfTbHJ
6/4+xEBX2j3VxUf1g3ayce8=
=kcDR
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 13:16:42 -0800] rev 573
transaction: nullify journal after close()
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
transaction: nullify journal after close()
This keeps us from trying to cleanup in __del__.
bug spotted by K Thananchayan <thananck@yahoo.com>
manifest hash: 1f4c5fa43d2458cdcb6ec0f0a7066b3c3e699f33
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxwQ6ywK+sNU5EO8RAuGhAJ9+BnKILwRCF9EKlPTz2zptiysQ/QCgsB3s
VKIehiStv+ibWQQi15k4mwk=
=nZD1
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 12:45:53 -0800] rev 572
[PATCH 5/5]: cleaning the template parent management in hgweb
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH 5/5]: cleaning the template parent management in hgweb
From: Goffredo Baroncelli <kreijack@libero.it>
remove the unused function hgweb.parent()
manifest hash: cd5a8812bc0ecbefb2e9e007f6e2bad12cd9e485
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxv0BywK+sNU5EO8RAtw8AJ4ttjQzg2ZT+17r054Uaidvn34ruwCgtTDt
Gcr7hR1VvMyFC70IWBdXIpE=
=oKEL
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 12:34:45 -0800] rev 571
[PATCH 3/5]: cleaning the template parent management in hgweb
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH 3/5]: cleaning the template parent management in hgweb
From: Goffredo Baroncelli <kreijack@libero.it>
the filediff template use the old style p1/p2 and p1rev/p2rev
inteface; the patch removes this old stuff, and update the code to the
new style
manifest hash: 29536b6ee71f03a48bceb7336040070ecd0d2b9e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxvplywK+sNU5EO8RApW4AKCrTLHofr8jELtvNRpoNJHc0sjEfgCfaY2q
/H96T6BMMXA4VLFVxzOBHCo=
=u4El
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 12:31:32 -0800] rev 570
[PATCH 2/5]: cleaning the template parent management in hgweb
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH 2/5]: cleaning the template parent management in hgweb
From: Goffredo Baroncelli <kreijack@libero.it>
hgweb: rename #parent1# and #parent2# to #parent# in the template managment
manifest hash: c7da29f029a1c875127989bb6635007a90f8f59c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxvmkywK+sNU5EO8RAnREAKCXuVAU054xkYsfQLug3y/u4tpGxQCfdnKA
QkX42FSUBN1EwFyzrzC6vs0=
=o8VK
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 12:27:27 -0800] rev 569
[PATCH 1/5]: cleaning the template parent management in hgweb
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH 1/5]: cleaning the template parent management in hgweb
From: Goffredo Baroncelli <kreijack@libero.it>
the template pages contain two entry named #parent1# and #parent2#;
this is no +good because with the template system implemented in hgweb
both the functions can be replaced with only one entry named
"#parent#". The code in hgweb will replace this tag with the
appropriate number of parents (+one, two... or more if and when will
be used ).
The first two patch perform this change in two step:
1) change the code to manage only one entry ( #parent1# )
2) remove any reference to #parent2#, and change both the code and the
templates to rename #parent1# in #parent2#
the last three patchs are clean-up.
The patch are five
- - patch #1:
- - clean the code in order to ignore #parent2# and use only #parent1#
hgweb: chanage the parent1/parent2 code managment
manifest hash: 6ba707904edf176c7269f2d9b80502902e6934c6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxvivywK+sNU5EO8RAkotAJ4vbR0KE+Jem20rQbaJxy8NRFeyJgCdHy2M
hxmeD9erv17BrSKLGd5QAQI=
=Or/F
-----END PGP SIGNATURE-----
mpm@selenic.com [Fri, 01 Jul 2005 14:46:31 -0800] rev 568
[PATCH] Add tags to hgweb
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Add tags to hgweb
From: Goffredo Baroncelli <kreijack@libero.it>
manifest hash: 3a59c363799c974b042dbb55f943d830feb1b34f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxcfHywK+sNU5EO8RAgEKAJ40SRMOyBOkbS8QU2MIBUzBnhu5AwCbBDjR
M+gaWyqzqOBzO1r+9zpb37k=
=l1pL
-----END PGP SIGNATURE-----
mpm@selenic.com [Fri, 01 Jul 2005 14:43:36 -0800] rev 567
Add parent revision numbers back to hgweb
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Add parent revision numbers back to hgweb
From: Goffredo Baroncelli <kreijack@libero.it>
manifest hash: 9f81492df935e94e7c544b071aa9caac3b102190
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxccYywK+sNU5EO8RAkW7AJ9aXTUZ9JnbZMrxCrcuXozYzkdw/gCfT8IO
qnqe966Mvapr2jULeXldQW4=
=XiV5
-----END PGP SIGNATURE-----
mpm@selenic.com [Fri, 01 Jul 2005 14:34:31 -0800] rev 566
repo.changes: fix duplicate changes
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
repo.changes: fix duplicate changes
We need to discard the changed and added lists from dirstate.changes
before adding to them when comparing manifests. Otherwise something
that changed from rev->parent->working dir will appear twice.
Bug spotted by Goffredo Baroncelli <kreijack@libero.it>
manifest hash: 64c335e2fe6df6d1ce29d0903f16821c7566768f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxcT3ywK+sNU5EO8RAivLAJ4gqbWfMnt+BdyGac/ZGduy2KbNegCgncPV
D4ay6Qw9sIodEPjRebvk3GE=
=AZd2
-----END PGP SIGNATURE-----