← Back to branch summary

~abentley/bzrtools/bzrtools.dev

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to hunk_selector.py

Committer: Aaron Bentley
Date: 2008-11-05 00:11:09 UTC
mto: This revision was merged to the branch mainline in revision 678.
Revision ID: aaron@aaronbentley.com-20081105001109-yt2dp0h5h3ssb7xt

Restore runtime ignore for .shelf

files added:
clean_tree.py

tests/clean_tree.py

tests/is_clean.py

tests/test_rspush.py

files removed:
.the_kraken

.the_kraken/config

conflict_diff.py

mirror.py

tests/test_conflict_diff.py

tests/test_fetch_ghosts.py

tests/test_graph.py

tests/test_mirror.py

files renamed:
check-release.py => release.py

files modified:
.bzrignore

INSTALL

NEWS

README

__init__.py

branches.py

bzrtools.py

cbranch.py

colordiff.py

command.py

command_classes.py

errors.py

fetch_ghosts.py

graph.py

heads.py

hunk_selector.py

patch.py

patchsource.py

progress.py

rspush.py

setup.py

shelf.py

shell.py

terminal.py

tests/blackbox.py

tests/shelf_tests.py

tests/test_cbranch.py

tests/test_link_tree.py

tests/upstream_import.py

upstream_import.py

userinteractor.py

version.py

zap.py

Show diffs side-by-side

added added

removed removed

hunk_selector.py

1

1

import sys

2

2

3

3

from userinteractor import UserInteractor, UserOption

4

from errors import NoColor, NoBzrtoolsColor

4

from errors import NoColor

5

5

import copy

6

6

7

7

class HunkSelector:

Older »