lp:~aaron-whitehouse/duplicity/filelist_combine

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~duplicity-team/duplicity/0.7-series at revision 1081

duplicity-team: Pending requested 2015-03-12

Diff: 2740 lines (+683/-919)

7 files modified

bin/duplicity.1 (+20/-82)
duplicity/commandline.py (+27/-4)
duplicity/selection.py (+27/-128)
po/duplicity.pot (+99/-106)
testing/functional/test_selection.py (+203/-193)
testing/stdin_test.sh (+203/-0)
testing/unit/test_selection.py (+104/-406)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1408411: Filelist (non-globbing) should include a folder if it contains higher priority included files	Medium	Fix Released
Bug #1423366: --include-globbing-filelist and --exclude-globbing-filelist should be removed (all filelists should be globbing)	Medium	Fix Released
Bug #1423367: --include-filelist-stdin and --exclude-filelist-stdin should be deprecated and ultimately removed	Medium	Fix Released

Link a bug report

Related blueprints

1077. By Aaron Whitehouse <email address hidden> on 2015-03-12

Updated duplicity.pot

1076. By Aaron Whitehouse <email address hidden> on 2015-03-12

Merge in changes to rebase against dev.

1075. By Aaron Whitehouse <email address hidden> on 2015-03-12

Changed tests to test filelist, rather than globbing filelist, except for one functional globbing test of each type to ensure this continues to work until it is deliberately removed. Changed naming of tests etc accordingly.

1074. By Aaron Whitehouse <email address hidden> on 2015-03-12

Removed unnecessary tests (post merging of non-globbing and globbing filelists) and created a globbing version of the one test that was only written for non-globbing filelists.

1073. By Aaron Whitehouse <email address hidden> on 2015-03-12

Updated manual to remove references to globbing filelists and stdin filelists and make consequential changes to the description of include-filelist and exclude-filelist behaviour.

1072. By Aaron Whitehouse <email address hidden> on 2015-02-18

Note Bug #1423367 was fixed in the previous commit.

1071. By Aaron Whitehouse <email address hidden> on 2015-02-18

Mark --include-filelist-stdin and --exclude-fielist-stdin for deprecation and hide from --help output. Add additional tests in stdin_test.sh to test --include-filelist-stdin and that /dev/stdin is an adequate replacement.

1070. By Aaron Whitehouse <email address hidden> on 2015-02-18

Added bash script (stdin_test.sh) showing that filelists from stdin were working as expected despite the changes.

1069. By Aaron Whitehouse <email address hidden> on 2015-02-07

Added deprecation warning to the --exclude-globbing-filelist and include-globbing-filelist options in commandline.py and hid them from help output. Commented out functions relating to non-globbing filelists. Commented out unit tests related to non-globbing filelists.

1068. By Aaron Whitehouse <email address hidden> on 2015-02-07

Made non-globbing filelists use the globbing code path (ie made all filelists globbing), as per:
http://lists.nongnu.org/archive/html/duplicity-talk/2015-01/msg00011.html
Fixed Bug #1408411 in the process, as this issue was limited to the non-globbing code path.