Fri, 26 Aug 2005 20:51:48 -0700 tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl> [Fri, 26 Aug 2005 20:51:48 -0700] rev 1077
tarball support v0.3 pt 2
Fri, 26 Aug 2005 20:51:34 -0700 tarball support v0.3
Wojciech Milkowski <wmilkowski@interia.pl> [Fri, 26 Aug 2005 20:51:34 -0700] rev 1076
tarball support v0.3 Hello, I'm slowly improving support for tarballs in Mercurial. Attached patch is made against current tip in Matt's repository - f859e9cba1b9, and contains everything done so far. Changes: - gzip and bzip2 tarballs are sent immediately without writing to temporary files (I was wrong Matt, it can be done very easy) - hgrc customization, you can choose which type (if any) you will support There's no easy way to support compression levels, since TarFile open() assume that it is 9. I tried to use gzopen(), and bz2open() methods instead, but it seems that headers of generated archives, are missing or wrong. We could eventually try to rewrite tarfile.py and include our own version into Mercurial, but I don't know if it's good idea... Wojtek
Fri, 26 Aug 2005 19:20:04 -0700 Fixed system command abord reason on windows.
Volker.Kleinfeld@gmx.de [Fri, 26 Aug 2005 19:20:04 -0700] rev 1075
Fixed system command abord reason on windows.
Fri, 26 Aug 2005 19:19:35 -0700 Add revlog.reachable to find a graph of ancestors for a given rev
mason@suse.com [Fri, 26 Aug 2005 19:19:35 -0700] rev 1074
Add revlog.reachable to find a graph of ancestors for a given rev
Fri, 26 Aug 2005 19:08:25 -0700 [PATCH] raise exceptions with Exception subclasses
Bart Trojanowski <bart@jukie.net> [Fri, 26 Aug 2005 19:08:25 -0700] rev 1073
[PATCH] raise exceptions with Exception subclasses Fixed the patch. Using Exception subclasses. (tweaked by mpm)
Fri, 26 Aug 2005 16:49:23 -0700 Fixes for push corner case
mpm@selenic.com [Fri, 26 Aug 2005 16:49:23 -0700] rev 1072
Fixes for push corner case TAH found a bug where push would push things the remote already had, raising an assertion. This turned out to be because the changeset protocol was not recording a common subset node in one case. Also discovered was that the protocol was queueing multiple copies of a node for pull. Fixed by changing fetch to a hash. Add some more debugging output.
Fri, 26 Aug 2005 14:05:52 -0700 Add support for extension modules
mason@suse.com [Fri, 26 Aug 2005 14:05:52 -0700] rev 1071
Add support for extension modules This adds support for an [extensions] section to hgrc. This has the form of: [extensions] mod=[path] If a path is specified, the python module found at that path is load. Otherwise, __import__ is used to find the module. Each module must implement a dict called cmdtable where the command line options for that module live. Each module must also implement a reposetup function: cmdtable = {} def reposetup(ui, repo): pass Index: hg/mercurial/ui.py ===================================================================
Fri, 26 Aug 2005 13:59:14 -0700 hgwebdir index: change "author" to "contact"
mpm@selenic.com [Fri, 26 Aug 2005 13:59:14 -0700] rev 1070
hgwebdir index: change "author" to "contact"
Fri, 26 Aug 2005 22:40:56 +0200 Allow using a ssh repository without a path.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 22:40:56 +0200] rev 1069
Allow using a ssh repository without a path. This uses the home directory on the remote side or the directory specified in the command in .ssh/authorized_keys
Fri, 26 Aug 2005 16:47:09 +0200 Fixed synopsis for grep command.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 16:47:09 +0200] rev 1068
Fixed synopsis for grep command.
Fri, 26 Aug 2005 16:37:28 +0200 Fixed zero-padded filenames with %r if there is a longer number in the middle.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 16:37:28 +0200] rev 1067
Fixed zero-padded filenames with %r if there is a longer number in the middle. e.g. with: hg export -o ../%r.patch 99 100 98
Fri, 26 Aug 2005 15:26:44 +0200 Shortened commands.revrange() a little bit, added docstring.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 15:26:44 +0200] rev 1066
Shortened commands.revrange() a little bit, added docstring.
Fri, 26 Aug 2005 15:19:18 +0200 Cleanups to commands.py
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 15:19:18 +0200] rev 1065
Cleanups to commands.py
Fri, 26 Aug 2005 13:31:40 +0200 Removed obsolete imports from hgwebdir.cgi
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 13:31:40 +0200] rev 1064
Removed obsolete imports from hgwebdir.cgi
Fri, 26 Aug 2005 13:29:52 +0200 Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 13:29:52 +0200] rev 1063
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Fri, 26 Aug 2005 13:06:58 +0200 pep-0008 cleanup
benoit.boissinot@ens-lyon.fr [Fri, 26 Aug 2005 13:06:58 +0200] rev 1062
pep-0008 cleanup - Don't use spaces around the '=' sign when used to indicate a keyword argument or a default parameter value.
Fri, 26 Aug 2005 02:03:35 -0700 Fix set type usage for Python 2.3
mpm@selenic.com [Fri, 26 Aug 2005 02:03:35 -0700] rev 1061
Fix set type usage for Python 2.3
Fri, 26 Aug 2005 01:56:49 -0700 Merge from BOS, fix help
mpm@selenic.com [Fri, 26 Aug 2005 01:56:49 -0700] rev 1060
Merge from BOS, fix help
Thu, 25 Aug 2005 17:13:48 -0700 grep: speed up matching, and only return one match per line.
bos@serpentine.internal.keyresearch.com [Thu, 25 Aug 2005 17:13:48 -0700] rev 1059
grep: speed up matching, and only return one match per line.
Thu, 25 Aug 2005 10:11:54 -0700 Use ui.write instead of print in debugwalk.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 25 Aug 2005 10:11:54 -0700] rev 1058
Use ui.write instead of print in debugwalk.
Thu, 25 Aug 2005 02:00:03 -0700 Add grep command.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 25 Aug 2005 02:00:03 -0700] rev 1057
Add grep command. It currently searches all revs of every matching file. I'll change this soon so that it can still do this, but it will not be the default behaviour. Many options are unimplemented. There's only one output mode. Binary files are not handled yet.
Wed, 24 Aug 2005 22:25:55 -0700 Map long option names containing dashes to ones containing underscores.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 24 Aug 2005 22:25:55 -0700] rev 1056
Map long option names containing dashes to ones containing underscores.
Fri, 26 Aug 2005 01:51:44 -0700 Minor test-help fix
mpm@selenic.com [Fri, 26 Aug 2005 01:51:44 -0700] rev 1055
Minor test-help fix
Fri, 26 Aug 2005 10:39:43 +0200 Fixed some synopsises in command help.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 10:39:43 +0200] rev 1054
Fixed some synopsises in command help.
Fri, 26 Aug 2005 10:01:55 +0200 Added missing doc strings for two new debug commmands.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 10:01:55 +0200] rev 1053
Added missing doc strings for two new debug commmands.
Fri, 26 Aug 2005 09:56:33 +0200 Adjust display and alignment of command options to match global options.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 09:56:33 +0200] rev 1052
Adjust display and alignment of command options to match global options.
Fri, 26 Aug 2005 09:15:04 +0200 Clean up displaying help of global options, only one row per option.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 09:15:04 +0200] rev 1051
Clean up displaying help of global options, only one row per option.
Fri, 26 Aug 2005 08:47:43 +0200 Moved --cwd handling to a place where ui and exception handling already exists.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 08:47:43 +0200] rev 1050
Moved --cwd handling to a place where ui and exception handling already exists.
Fri, 26 Aug 2005 08:42:56 +0200 Allow --help and --version being used together.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 08:42:56 +0200] rev 1049
Allow --help and --version being used together.
Fri, 26 Aug 2005 08:37:41 +0200 Added options -h/--help.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 08:37:41 +0200] rev 1048
Added options -h/--help.
Fri, 26 Aug 2005 08:26:21 +0200 Moved special handling of --version and no hg command from parse to dispatch.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 08:26:21 +0200] rev 1047
Moved special handling of --version and no hg command from parse to dispatch. This allows e.g. 'hg status --version' to work.
Thu, 25 Aug 2005 18:35:35 +0200 Sort global options by topic: directories, ui, timing, other
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 25 Aug 2005 18:35:35 +0200] rev 1046
Sort global options by topic: directories, ui, timing, other (and changed indentation to match command table)
Thu, 25 Aug 2005 18:25:19 +0200 run the doc/* through aspell.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 25 Aug 2005 18:25:19 +0200] rev 1045
run the doc/* through aspell.
Thu, 25 Aug 2005 16:00:08 +0200 Removed forgotten debug print statement from commands.py and tests.
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.
Wed, 24 Aug 2005 19:19:35 -0700 Update tests
mpm@selenic.com [Wed, 24 Aug 2005 19:19:35 -0700] rev 1043
Update tests
Wed, 24 Aug 2005 19:16:45 -0700 Fix a couple fencepost errors in hg log
mpm@selenic.com [Wed, 24 Aug 2005 19:16:45 -0700] rev 1042
Fix a couple fencepost errors in hg log
Wed, 24 Aug 2005 18:45:49 -0700 Fix hg log -p
mpm@selenic.com [Wed, 24 Aug 2005 18:45:49 -0700] rev 1041
Fix hg log -p
Wed, 24 Aug 2005 18:42:42 -0700 Show number of new heads when doing a pull
mpm@selenic.com [Wed, 24 Aug 2005 18:42:42 -0700] rev 1040
Show number of new heads when doing a pull
Wed, 24 Aug 2005 18:40:17 -0700 Add debugdata for dumping revlog revision data
mpm@selenic.com [Wed, 24 Aug 2005 18:40:17 -0700] rev 1039
Add debugdata for dumping revlog revision data
Wed, 24 Aug 2005 14:46:02 -0700 Merge with MPM.
bos@eng-25.internal.keyresearch.com [Wed, 24 Aug 2005 14:46:02 -0700] rev 1038
Merge with MPM.
Wed, 24 Aug 2005 14:45:35 -0700 Fix a small corner of log behaviour.
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.
Wed, 24 Aug 2005 14:24:20 -0700 Update hg log docs
mpm@selenic.com [Wed, 24 Aug 2005 14:24:20 -0700] rev 1036
Update hg log docs
Wed, 24 Aug 2005 13:31:46 -0700 Merge with BOS
mpm@selenic.com [Wed, 24 Aug 2005 13:31:46 -0700] rev 1035
Merge with BOS
Wed, 24 Aug 2005 13:26:45 -0700 Fix help output, and a few broken tests.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 24 Aug 2005 13:26:45 -0700] rev 1034
Fix help output, and a few broken tests.
Wed, 24 Aug 2005 12:50:11 -0700 Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 24 Aug 2005 12:50:11 -0700] rev 1033
Merge with MPM.
Wed, 24 Aug 2005 12:43:09 -0700 Get patchbomb working with tip again.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 24 Aug 2005 12:43:09 -0700] rev 1032
Get patchbomb working with tip again.
Wed, 24 Aug 2005 12:39:10 -0700 Rewrite log command. New version is faster and more featureful.
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.
Tue, 23 Aug 2005 21:57:22 -0700 Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 23 Aug 2005 21:57:22 -0700] rev 1030
Merge with MPM.
Tue, 23 Aug 2005 21:53:13 -0700 Emacs: implement hg-incoming, hg-outgoing and hg-push.
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.
Tue, 23 Aug 2005 21:30:12 -0700 Add commands.debugconfig.
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.
Tue, 23 Aug 2005 16:46:10 -0700 Emacs: fix up hg-log and hg-diff to operate more uniformly.
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.
Tue, 23 Aug 2005 15:42:06 -0700 Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 23 Aug 2005 15:42:06 -0700] rev 1026
Merge with MPM.
Tue, 23 Aug 2005 15:30:06 -0700 Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 23 Aug 2005 15:30:06 -0700] rev 1025
Merge with MPM.
Tue, 23 Aug 2005 15:27:17 -0700 Sync buffers prior to doing a diff.
bos@serpentine.internal.keyresearch.com [Tue, 23 Aug 2005 15:27:17 -0700] rev 1024
Sync buffers prior to doing a diff.
Wed, 24 Aug 2005 03:33:54 -0700 Minor tweak to the revgen algorithm
mpm@selenic.com [Wed, 24 Aug 2005 03:33:54 -0700] rev 1023
Minor tweak to the revgen algorithm
Wed, 24 Aug 2005 03:32:08 -0700 Minor hgwebdir tweaks
mpm@selenic.com [Wed, 24 Aug 2005 03:32:08 -0700] rev 1022
Minor hgwebdir tweaks - ignore / for PATH_INFO - fix // in URLs
Wed, 24 Aug 2005 00:38:36 -0700 Add Makefile to the manifest
mpm@selenic.com [Wed, 24 Aug 2005 00:38:36 -0700] rev 1021
Add Makefile to the manifest
Wed, 24 Aug 2005 00:36:12 -0700 Add default make rule
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.
Wed, 24 Aug 2005 00:32:10 -0700 Create helper functions for I/O to files in 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.
Wed, 24 Aug 2005 00:12:04 -0700 Add some aliases
mpm@selenic.com [Wed, 24 Aug 2005 00:12:04 -0700] rev 1018
Add some aliases
Wed, 24 Aug 2005 00:09:56 -0700 Fix up help for binary options
mpm@selenic.com [Wed, 24 Aug 2005 00:09:56 -0700] rev 1017
Fix up help for binary options
Tue, 23 Aug 2005 20:21:52 -0700 Teach annotate about binary files
mpm@selenic.com [Tue, 23 Aug 2005 20:21:52 -0700] rev 1016
Teach annotate about binary files
Tue, 23 Aug 2005 19:58:46 -0700 Add automatic binary file detection to diff and export
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
Tue, 23 Aug 2005 18:58:26 -0700 Clean up argument passing for dodiff
mpm@selenic.com [Tue, 23 Aug 2005 18:58:26 -0700] rev 1014
Clean up argument passing for dodiff
Tue, 23 Aug 2005 16:19:14 -0700 Deal with repos with missing timezones
mpm@selenic.com [Tue, 23 Aug 2005 16:19:14 -0700] rev 1013
Deal with repos with missing timezones
Tue, 23 Aug 2005 15:15:14 -0700 Merge with BOS
mpm@selenic.com [Tue, 23 Aug 2005 15:15:14 -0700] rev 1012
Merge with BOS
Tue, 23 Aug 2005 14:51:52 -0700 Emacs: search for hg in path before looking in funny places.
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.
Tue, 23 Aug 2005 14:21:19 -0700 Merge with TAH
mpm@selenic.com [Tue, 23 Aug 2005 14:21:19 -0700] rev 1010
Merge with TAH
Mon, 22 Aug 2005 19:56:52 +0200 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 19:56:52 +0200] rev 1009
Don't show the diff in hgeditor if there are no changes in file contents.
Mon, 22 Aug 2005 08:46:43 +0200 Add Makefile for generating release tarballs.
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
Mon, 22 Aug 2005 08:39:44 +0200 Include generated documentation in MANIFEST.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 22 Aug 2005 08:39:44 +0200] rev 1007
Include generated documentation in MANIFEST.
Mon, 22 Aug 2005 08:33:02 +0200 Generate html documentation by default, too.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 22 Aug 2005 08:33:02 +0200] rev 1006
Generate html documentation by default, too.
Tue, 23 Aug 2005 14:20:17 -0700 Merge with BOS
mpm@selenic.com [Tue, 23 Aug 2005 14:20:17 -0700] rev 1005
Merge with BOS
Mon, 22 Aug 2005 15:29:55 -0700 Emacs: improved GNU Emacs support.
bos@serpentine.internal.keyresearch.com [Mon, 22 Aug 2005 15:29:55 -0700] rev 1004
Emacs: improved GNU Emacs support.
Mon, 22 Aug 2005 15:08:20 -0700 Emacs support: numerous changes.
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.
Mon, 22 Aug 2005 13:06:43 -0700 Merge with MPM.
bos@eng-25.internal.keyresearch.com [Mon, 22 Aug 2005 13:06:43 -0700] rev 1002
Merge with MPM.
Mon, 22 Aug 2005 03:41:09 -0700 Emacs: update mode lines properly after commit.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 22 Aug 2005 03:41:09 -0700] rev 1001
Emacs: update mode lines properly after commit.
Mon, 22 Aug 2005 03:27:27 -0700 Emacs: kill commit buffer once it's done with.
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.
Mon, 22 Aug 2005 03:16:32 -0700 Emacs: first cut at commit support.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 22 Aug 2005 03:16:32 -0700] rev 999
Emacs: first cut at commit support.
Sun, 21 Aug 2005 23:33:02 -0800 contrib/patchbomb: Fix buglet with empty cc list.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 21 Aug 2005 23:33:02 -0800] rev 998
contrib/patchbomb: Fix buglet with empty cc list.
Sun, 21 Aug 2005 23:03:14 -0800 Fix handling of addresses in hgrc.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 21 Aug 2005 23:03:14 -0800] rev 997
Fix handling of addresses in hgrc.
Sun, 21 Aug 2005 22:46:57 -0800 Emacs: document existing functions.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 21 Aug 2005 22:46:57 -0800] rev 996
Emacs: document existing functions.
Sun, 21 Aug 2005 21:51:01 -0800 Emacs support: add hg-revert-buffer.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 21 Aug 2005 21:51:01 -0800] rev 995
Emacs support: add hg-revert-buffer.
Tue, 23 Aug 2005 12:46:43 -0700 Fix callers to file.revision to use file.read
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.
Tue, 23 Aug 2005 02:19:38 -0700 Clean up some merge logic
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
Mon, 22 Aug 2005 01:22:29 -0700 Fix up some bugs introduced by recent merge changes
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
Sun, 21 Aug 2005 22:03:36 -0700 merge: remove remaining mark bits
mpm@selenic.com [Sun, 21 Aug 2005 22:03:36 -0700] rev 991
merge: remove remaining mark bits
Sun, 21 Aug 2005 21:59:55 -0700 Fix long-standing excessive file merges
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.
Sun, 21 Aug 2005 16:51:50 -0700 Reformat debugindex output
mpm@selenic.com [Sun, 21 Aug 2005 16:51:50 -0700] rev 989
Reformat debugindex output
Sun, 21 Aug 2005 16:00:07 -0700 Remove unused relfilter function
mpm@selenic.com [Sun, 21 Aug 2005 16:00:07 -0700] rev 988
Remove unused relfilter function
Sun, 21 Aug 2005 15:56:14 -0700 hgweb: change startup argument processing
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
Sun, 21 Aug 2005 15:00:02 -0700 Add web:style option
mpm@selenic.com [Sun, 21 Aug 2005 15:00:02 -0700] rev 986
Add web:style option
Sun, 21 Aug 2005 13:18:45 -0700 hgweb: fix RSS and raw for new % scheme
mpm@selenic.com [Sun, 21 Aug 2005 13:18:45 -0700] rev 985
hgweb: fix RSS and raw for new % scheme
Sun, 21 Aug 2005 11:52:52 -0700 Remove debug print
mpm@selenic.com [Sun, 21 Aug 2005 11:52:52 -0700] rev 984
Remove debug print
Sun, 21 Aug 2005 11:46:39 -0700 Fix RSS feeds
mpm@selenic.com [Sun, 21 Aug 2005 11:46:39 -0700] rev 983
Fix RSS feeds
Sat, 20 Aug 2005 13:11:36 -0700 hgweb: convert index entries to list expansion style
mpm@selenic.com [Sat, 20 Aug 2005 13:11:36 -0700] rev 982
hgweb: convert index entries to list expansion style
Sat, 20 Aug 2005 13:08:07 -0700 Merge with jeffpc
mpm@selenic.com [Sat, 20 Aug 2005 13:08:07 -0700] rev 981
Merge with jeffpc
Wed, 17 Aug 2005 22:59:47 -0500 Merge with MPM
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 17 Aug 2005 22:59:47 -0500] rev 980
Merge with MPM
Wed, 17 Aug 2005 22:32:47 -0500 hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 17 Aug 2005 22:32:47 -0500] rev 979
hgweb: Changed manifest page to list format syntax
Wed, 17 Aug 2005 22:08:15 -0500 hgweb: Changed file revision 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
Wed, 17 Aug 2005 22:03:28 -0500 hgweb: Changed annotate 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
Wed, 17 Aug 2005 21:59:02 -0500 hgweb: Changed file 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
Wed, 17 Aug 2005 21:45:44 -0500 hgweb: Changed changelog 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
Wed, 17 Aug 2005 21:14:20 -0500 Added support for #foo%bar# 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
Sat, 20 Aug 2005 11:59:10 -0700 Deal with non-integer date offsets generated by some tools
mpm@selenic.com [Sat, 20 Aug 2005 11:59:10 -0700] rev 973
Deal with non-integer date offsets generated by some tools
Sat, 20 Aug 2005 01:46:57 -0700 Added tag 0.6c for changeset eac9c8efcd9bd8244e72fb6821f769f450457a32
mpm@selenic.com [Sat, 20 Aug 2005 01:46:57 -0700] rev 972
Added tag 0.6c for changeset eac9c8efcd9bd8244e72fb6821f769f450457a32
Sat, 20 Aug 2005 01:35:45 -0700 Remove call to non-existent date_parser 0.6c
mpm@selenic.com [Sat, 20 Aug 2005 01:35:45 -0700] rev 971
Remove call to non-existent date_parser
Sat, 20 Aug 2005 01:29:04 -0700 Fix possible unitialized variable warnings
mpm@selenic.com [Sat, 20 Aug 2005 01:29:04 -0700] rev 970
Fix possible unitialized variable warnings
Sat, 20 Aug 2005 00:49:41 -0700 Minor README updates
mpm@selenic.com [Sat, 20 Aug 2005 00:49:41 -0700] rev 969
Minor README updates
Fri, 19 Aug 2005 23:26:32 -0800 [PATCH] Take DST into account
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.
Fri, 19 Aug 2005 23:23:42 -0800 [PATCH] Print timezone offset when outputting dates
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. [...]
Fri, 19 Aug 2005 23:07:31 -0800 hg import: abort with uncommitted changes, override with --force
mpm@selenic.com [Fri, 19 Aug 2005 23:07:31 -0800] rev 966
hg import: abort with uncommitted changes, override with --force
Fri, 19 Aug 2005 22:48:43 -0800 Use post-expanded clone pathname as default
mpm@selenic.com [Fri, 19 Aug 2005 22:48:43 -0800] rev 965
Use post-expanded clone pathname as default
Fri, 19 Aug 2005 22:12:40 -0800 hgweb: Make maxfiles, maxchanges, and allowpull proper config options
mpm@selenic.com [Fri, 19 Aug 2005 22:12:40 -0800] rev 964
hgweb: Make maxfiles, maxchanges, and allowpull proper config options
Fri, 19 Aug 2005 22:11:48 -0800 Add -e and --remotecmd for clone and pull too
mpm@selenic.com [Fri, 19 Aug 2005 22:11:48 -0800] rev 963
Add -e and --remotecmd for clone and pull too
Fri, 19 Aug 2005 21:47:46 -0800 Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com [Fri, 19 Aug 2005 21:47:46 -0800] rev 962
Doc updates for push, pull, hooks, local tags, and ssh options
Fri, 19 Aug 2005 21:36:57 -0800 Add --ssh and --remotecmd to push
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
Fri, 19 Aug 2005 21:25:25 -0800 Add ui.setconfig overlay
mpm@selenic.com [Fri, 19 Aug 2005 21:25:25 -0800] rev 960
Add ui.setconfig overlay This can simplify option passing
Fri, 19 Aug 2005 18:56:20 -0800 Fix option parsing bug for empty short options
mpm@selenic.com [Fri, 19 Aug 2005 18:56:20 -0800] rev 959
Fix option parsing bug for empty short options
Fri, 19 Aug 2005 18:47:05 -0800 Make mercurial.el load with GNU emacs
mpm@selenic.com [Fri, 19 Aug 2005 18:47:05 -0800] rev 958
Make mercurial.el load with GNU emacs
(0) -1000 -120 +120 +1000 +3000 +10000 +30000 tip