##// END OF EJS Templates
changegroup: cg3 has two empty groups *after* manifests...
changegroup: cg3 has two empty groups *after* manifests changegroup.getchunks() determines the end of the stream by looking for an empty chunk group (two consecutive empty chunks). It ignores empty groups in the first two groups. Changegroup 3 introduced an empty chunk between the manifests and the files, which confuses getchunks(). Since it comes after the first two, getchunks() will stop there. Fix by rewriting getchunks so it first counts two groups (empty or not) and then keeps antostarts counting empty groups. With this counting, changegroup 1 and 2 have exactly one empty group after the first two groups, while changegroup 3 has two (one for directories and one for files). It's a little hard to test this at this point, but I have verified that this patch fixes narrowhg (which was broken before this patch). Also, future patches will fix "hg strip" with treemanifests, and once that's done, getchunks() will be tested through tests of "hg strip".

File last commit:

r26098:ce26928c default
r27920:da5f2336 stable
Show More
patchreview.txt
97 lines | 3.9 KiB | text/plain | TextLexer
Manpreet Singh
Updated contrib/vim/patchreview.* to version 0.2.1...
r10545 *patchreview.txt* Vim global plugin for doing single, multi-patch or diff code reviews
Manpreet Singh
Updated contrib/vim/patchreview.* to version 0.2.2...
r10550 Version v0.2.2 (for Vim version 7.0 or higher)
Manpreet Singh
contrib: patch review plugin for vim 7.0...
r2350
Manpreet Singh
Updated contrib/vim/patchreview.* to version 0.2.1...
r10545 Author: Manpreet Singh < junkblocker@yahoo.com >
Copyright (C) 2006-2010 by Manpreet Singh
Manpreet Singh
contrib: patch review plugin for vim 7.0...
r2350 License : This file is placed in the public domain.
=============================================================================
Manpreet Singh
Updated contrib/vim/patchreview.* to version 0.2.1...
r10545 CONTENTS *patchreview* *diffreview* *patchreview-contents*
Manpreet Singh
contrib: patch review plugin for vim 7.0...
r2350
1. Contents.........................................: |patchreview-contents|
2. Introduction.....................................: |patchreview-intro|
3. PatchReview options..............................: |patchreview-options|
4. PatchReview Usage................................: |patchreview-usage|
Manpreet Singh
Updated contrib/vim/patchreview.* to version 0.2.1...
r10545 4.1 DiffReview Usage.............................: |:DiffReview|
4.2 PatchReview Usage............................: |:PatchReview|
Manpreet Singh
contrib: patch review plugin for vim 7.0...
r2350
=============================================================================
PatchReview Introduction *patchreview-intro*
Manpreet Singh
Updated contrib/vim/patchreview.* to version 0.2.1...
r10545 The Patch Review plugin allows easy single or multipatch code or diff reviews.
It opens each affected file in the patch or in a workspace diff in a diff view
in a separate tab.
VIM provides the |:diffpatch| and related commands to do single file reviews
but can not handle patch files containing multiple patches as is common with
software development projects. This plugin provides that missing
functionality.
timeless@mozdev.org
spelling: behaviour -> behavior
r26098 It also improves on |:diffpatch|'s behavior of creating the patched files in
Manpreet Singh
contrib: patch review plugin for vim 7.0...
r2350 the same directory as original file which can lead to project workspace
pollution.
Manpreet Singh
Updated contrib/vim/patchreview.* to version 0.2.2...
r10550 It does automatic diff generation for various version control systems by
running their diff command.
Manpreet Singh
contrib: patch review plugin for vim 7.0...
r2350 =============================================================================
PatchReview Options *patchreview-options*
Manpreet Singh
Updated contrib/vim/patchreview.* to version 0.2.2...
r10550 g:patchreview_patch = {string}
Optional path to patch binary. PatchReview tries to locate patch on
system path automatically. If the binary is not on system path, this
option tell PatchReview the full path to the binary. This option, if
specified, overrides the default patch binary on the path.
Manpreet Singh
Updated contrib/vim/patchreview.* to version 0.2.1...
r10545
examples:
Manpreet Singh
Updated contrib/vim/patchreview.* to version 0.2.2...
r10550 (On Windows with Cygwin) >
let g:patchreview_patch = 'c:\\cygwin\\bin\\patch.exe'
Manpreet Singh
Updated contrib/vim/patchreview.* to version 0.2.1...
r10545 <
(On *nix systems) >
Manpreet Singh
Updated contrib/vim/patchreview.* to version 0.2.2...
r10550 let g:patchreview_patch = '/usr/bin/gpatch'
Manpreet Singh
Updated contrib/vim/patchreview.* to version 0.2.1...
r10545 <
g:patchreview_filterdiff = {string}
Optional path to filterdiff binary. PatchReview tries to locate
filterdiff on system path automatically. If the binary is not on system
path, this option tell PatchReview the full path to the binary. This
option, if specified, overrides the default filterdiff binary on the
path.
Manpreet Singh
contrib: patch review plugin for vim 7.0...
r2350
examples:
(On Windows with Cygwin)
Manpreet Singh
Updated contrib/vim/patchreview.* to version 0.2.1...
r10545 >
Manpreet Singh
contrib: patch review plugin for vim 7.0...
r2350 let g:patchreview_filterdiff = 'c:\\cygwin\\bin\\filterdiff.exe'
Manpreet Singh
Updated contrib/vim/patchreview.* to version 0.2.1...
r10545 <
Manpreet Singh
contrib: patch review plugin for vim 7.0...
r2350 (On *nix systems)
Manpreet Singh
Updated contrib/vim/patchreview.* to version 0.2.1...
r10545 >
Manpreet Singh
contrib: patch review plugin for vim 7.0...
r2350 let g:patchreview_filterdiff = '/usr/bin/filterdiff'
Manpreet Singh
Updated contrib/vim/patchreview.* to version 0.2.1...
r10545 <
Manpreet Singh
contrib: patch review plugin for vim 7.0...
r2350 =============================================================================
PatchReview Usage *patchreview-usage*
Manpreet Singh
Updated contrib/vim/patchreview.* to version 0.2.1...
r10545 *:DiffReview*
:DiffReview
Perform a diff review in the current directory under version control.
Currently supports Mercurial (hg), Subversion (svn), CVS, Bazaar (bzr) and
Monotone.
Manpreet Singh
contrib: patch review plugin for vim 7.0...
r2350 *:PatchReview*
:PatchReview patchfile_path [optional_source_directory]
Perform a patch review in the current directory based on the supplied
patchfile_path. If optional_source_directory is specified, patchreview is
Manpreet Singh
Updated contrib/vim/patchreview.* to version 0.2.1...
r10545 done on that directory. Otherwise, the current directory is assumed to be
Manpreet Singh
contrib: patch review plugin for vim 7.0...
r2350 the source directory.
Manpreet Singh
Updated contrib/vim/patchreview.* to version 0.2.1...
r10545
Only supports context or unified format patches.
------------------------------------------------------------------------------
vim: ft=help:ts=2:sts=2:sw=2:tw=78:norl: