← Back to branch summary

~ubuntu-branches/ubuntu/utopic/bzr-builddeb/utopic

« back to all changes in this revision

Viewing changes to quilt.py

  • Committer: Package Import Robot
  • Author(s): Jelmer Vernooij
  • Date: 2012-01-22 14:45:04 UTC
  • Revision ID: package-import@ubuntu.com-20120122144504-d51fv28i5srs3v8s
Tags: 2.8.2
* Only warn about unapplying quilt patches when there are actually
  patches to unapply.
* Don't throw a traceback when quilt unapplying fails.
* Read configuration from original working tree, in case there are
  conflicts during merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
quilt.py
94
94
    return output[0]
95
95
 
96
96
 
97
 
def quilt_pop_all(working_dir, patches_dir=None, series_file=None, quiet=None):
 
97
def quilt_pop_all(working_dir, patches_dir=None, series_file=None, quiet=None,
 
98
        force=False):
98
99
    """Pop all patches.
99
100
 
100
101
    :param working_dir: Directory to work in
101
102
    :param patches_dir: Optional patches directory
102
103
    :param series_file: Optional series file
103
104
    """
104
 
    return run_quilt(["pop", "-a"], working_dir=working_dir,
 
105
    args = ["pop", "-a"]
 
106
    if force:
 
107
        args.append("-f")
 
108
    return run_quilt(args, working_dir=working_dir,
105
109
        patches_dir=patches_dir, series_file=series_file, quiet=quiet)
106
110
 
107
111
 
117
121
        patches_dir=patches_dir, series_file=series_file, quiet=quiet)
118
122
 
119
123
 
120
 
def quilt_push_all(working_dir, patches_dir=None, series_file=None, quiet=None):
 
124
def quilt_push_all(working_dir, patches_dir=None, series_file=None, quiet=None,
 
125
        force=False):
121
126
    """Push all patches.
122
127
 
123
128
    :param working_dir: Directory to work in
124
129
    :param patches_dir: Optional patches directory
125
130
    :param series_file: Optional series file
126
131
    """
127
 
    return run_quilt(["push", "-a"], working_dir=working_dir,
 
132
    args = ["push", "-a"]
 
133
    if force:
 
134
        args.append("-f")
 
135
    return run_quilt(args, working_dir=working_dir,
128
136
            patches_dir=patches_dir, series_file=series_file, quiet=quiet)
129
137
 
130
138