Add Vim modelines for consistent spacing TopGit shell scripts use tabs and this commit instructs Vim via modeline not to expand tabs. Signed-off-by: martin f. krafft <madduck@debian.org> Acked-by: Petr Baudis <pasky@ucw.cz>
tg import: More graceful conflicts handling
tg import: Construct actually proper .topmsg file
tg import -s: Whitespace fix
tg import -d: Explicitly specify base dependency of the created branches
tg import -s: Import single commit using well-defined name
tg import: fix + make more robust a5bf892d0900cbf9949f628c3e05db599341a02c (tg import: Check out new files as we go) broke tg-import. This is how it fails after that change: $ tg import Z~~..Z tg: ---- Importing e3e8c1382fe4cedca31e955910914ae0033455eb to t/Z tg: Automatically marking dependency on master tg: Creating t/Z base from master... Switched to a new branch "t/Z" tg: Topic branch t/Z set up. Please fill .topmsg now and make initial commit. tg: To abort: git rm -f .top* && git checkout master && tg delete t/Z fatal: pathspec '.topdeps' did not match any files That's why, when we do git read-tree -u -m it _kills_ .topmsg and .topdep both in index and in working tree! Also, imagine that we are going to import patch C onto A o---B---A \ C With read-tree we'll *override* any change in common files between A and B, so I think read-tree is wrong here (it was ok if we are importing on top of B). What is right it seems, is to work on diff level -- to use cherry-pick. And since cherry-pick does not kill our already-in-index .topmsg and .topdeps we automatically fix the breakage. Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru>
tg import: Check out new files as we go This causes a little overhead, but silences confusing git checkout status messages and makes sure we end up with sensible working tree after the whole tg import is over.
tg import: Require clean working tree and index
tg import: Make the progress reporting stand out more
tg import: Fix up process_commit() progress reporting
tg import -p PREFIX: Custom prefix instead of t/
tg import: Change default prefix from tp/ to t/
tg import: Remove tg_ prefixes from functions
tg import: Standard options parsing
tg import: Standard script header
topgit: Implement tg-import This can be used to import a set of commits between range specified by range1..range2 This should help us to convert an already existing quilt, stgit branches to topgit managed one Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>