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
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.