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