Show More
@@ -19,8 +19,6 from subprocess import check_call, Popen | |||||
19 | # cannot use argparse, python 2.7 only |
|
19 | # cannot use argparse, python 2.7 only | |
20 | from optparse import OptionParser |
|
20 | from optparse import OptionParser | |
21 |
|
21 | |||
22 |
|
||||
23 |
|
||||
24 | def check_output(*args, **kwargs): |
|
22 | def check_output(*args, **kwargs): | |
25 | kwargs.setdefault('stderr', PIPE) |
|
23 | kwargs.setdefault('stderr', PIPE) | |
26 | kwargs.setdefault('stdout', PIPE) |
|
24 | kwargs.setdefault('stdout', PIPE) |
@@ -208,8 +208,6 def commitfuncfor(repo, src): | |||||
208 | repo.ui.restoreconfig(phasebackup) |
|
208 | repo.ui.restoreconfig(phasebackup) | |
209 | return commitfunc |
|
209 | return commitfunc | |
210 |
|
210 | |||
211 |
|
||||
212 |
|
||||
213 | def applychanges(ui, repo, ctx, opts): |
|
211 | def applychanges(ui, repo, ctx, opts): | |
214 | """Merge changeset from ctx (only) in the current working directory""" |
|
212 | """Merge changeset from ctx (only) in the current working directory""" | |
215 | wcpar = repo.dirstate.parents()[0] |
|
213 | wcpar = repo.dirstate.parents()[0] |
@@ -62,8 +62,6 def read(repo): | |||||
62 | partial = None |
|
62 | partial = None | |
63 | return partial |
|
63 | return partial | |
64 |
|
64 | |||
65 |
|
||||
66 |
|
||||
67 | ### Nearest subset relation |
|
65 | ### Nearest subset relation | |
68 | # Nearest subset of filter X is a filter Y so that: |
|
66 | # Nearest subset of filter X is a filter Y so that: | |
69 | # * Y is included in X, |
|
67 | # * Y is included in X, |
@@ -221,8 +221,6 def pushdiscovery(stepname): | |||||
221 | return func |
|
221 | return func | |
222 | return dec |
|
222 | return dec | |
223 |
|
223 | |||
224 |
|
||||
225 |
|
||||
226 | def _pushdiscovery(pushop): |
|
224 | def _pushdiscovery(pushop): | |
227 | """Run all discovery steps""" |
|
225 | """Run all discovery steps""" | |
228 | for stepname in pushdiscoveryorder: |
|
226 | for stepname in pushdiscoveryorder: |
General Comments 0
You need to be logged in to leave comments.
Login now