- Projects

[Projects] [LrdeTools] 257: Fix some typos, and add acknowledgments.
by Nicolas Pouillard 30 Sep '05

30 Sep '05

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Fix some typos, and add acknowledgments. * vcs/NEWS, * vcs/lib/vcs/vcs.rb, * vcs/lib/vcs/junk.rb, * vcs/lib/vcs/common_commit.rb: Update. NEWS | 13 +++++++------ lib/vcs/common_commit.rb | 2 +- lib/vcs/junk.rb | 4 ++-- lib/vcs/vcs.rb | 4 ++-- 4 files changed, 12 insertions(+), 11 deletions(-) Index: vcs/NEWS --- vcs/NEWS (revision 256) +++ vcs/NEWS (working copy) @@ -48,26 +48,27 @@ * Commands: - svn list: - - Now support category listing: + - Now supports category listing: - list all junk files in foo: svn list --junk foo - list all precious, and unmasked files: svn list --precious --unmask - - Action support (--do switch): + - Action supports (--do switch): - svn list --junk --do rm - svn list --precious --do wc - svn junk: This command use `list' to remove all junk files. * Sorted outputs: - - Vcs now support sorting!!! + - Vcs now supports sorting: In a .vcs configuration file you can add a `sorting' key which - contains a list of regular expressions. + contains a list of regular expressions (Thanks to Akim Demaille and + Alexandre Borghi for this idea). For example: >>>> ~/.vcs <<<< --- sorting: - - !re (NEWS|README|TODO) # These files in first + - !re (NEWS|README|TODO) # These files first - !re src/ # Then the src directory - !re test/ # Then the test directory - !re parse/ # parse and ast are subdirectories @@ -87,7 +88,7 @@ # - test/parse/a.cc # - test/ast/a.hh # - test/ast/a.cc - - Affected commands: + - Concerned commands: - status - diffw (a more human readable diff) - mk_log_entry Index: vcs/lib/vcs/vcs.rb --- vcs/lib/vcs/vcs.rb (revision 256) +++ vcs/lib/vcs/vcs.rb (working copy) @@ -598,9 +598,9 @@ end # Set the given method as default commit action, use commit_ for the old one - # This method can be called just one time to avoid conflicts + # This method can be called just once to avoid conflicts def default_commit ( meth ) - just_one_time do + just_once do alias_command :commit, meth alias_command :ci, meth end Index: vcs/lib/vcs/junk.rb --- vcs/lib/vcs/junk.rb (revision 256) +++ vcs/lib/vcs/junk.rb (working copy) @@ -7,10 +7,10 @@ class Vcs # This command removes all junk files (by default all files begining with `,'). - # Warning: this command removes some files that may contains some relevant + # Warning: this command removes some files that may contains some important # information. For example during a commit the information that you type is # stored in one of these `,files'. So be careful using this command. - # See the user configuration to customize what is considered as a junk file. + # See the user configuration to customize what is considered a junk file. def junk! ( files=[], options={} ) list!(files, options.merge(:junk => true)) do |path_list| path_list.each { |path| logger.info { "Remove #{path}" } } Index: vcs/lib/vcs/common_commit.rb --- vcs/lib/vcs/common_commit.rb (revision 256) +++ vcs/lib/vcs/common_commit.rb (working copy) @@ -27,7 +27,7 @@ raise Failure, " |You have unrecognized files in your working copy ! |This meant that these files won't be commited ! - |You have some solutions to get rid of this limitation: + |You have some solutions to comply with the rule: |- You must put these files in some categories. | For instance you can rename these files and put a `+' before | to make it `precious':

1 0

Re: [LrdeTools] 254: Vcs outputs can now be sorted!.
by Akim Demaille 30 Sep '05

30 Sep '05

>>> "Nicolas" == Nicolas Pouillard <ertai(a)lrde.epita.fr> writes: > https://svn.lrde.epita.fr/svn/lrdetools/trunk > Index: ChangeLog > from Nicolas Pouillard <ertai(a)lrde.epita.fr> > Vcs outputs can now be sorted!. !. -> ! Excellent ! Et merci pour l'acknow ledgement. > + * Sorted outputs: > + - Vcs now support sorting!!! supports. !!! -> . > + sorting: > + - !re (NEWS|README|TODO) # These files in first s/in// > + - !re src/ # Then the src directory > + - !re test/ # Then the test directory > + - !re parse/ # parse and ast are subdirectories > + - !re ast/ # present in both src and test > + - !re \.cc$ # directories. Thus you will get > + - !re \.hh$ # something like: > + # - NEWS > + # - src/parse/a.hh > + # - src/parse/b.hh > + # - src/parse/a.cc > + # - src/parse/b.cc > + # - src/ast/a.hh > + # - src/ast/b.hh > + # - src/ast/a.cc > + # - src/ast/b.cc > + # - test/parse/a.hh > + # - test/parse/a.cc > + # - test/ast/a.hh > + # - test/ast/a.cc Mauvaise indentation à partir de thus. > + - Affected commands: "affected": this is a disease? > + - status > + - diffw (a more human readable diff) > + - mk_log_entry > + - mk_changelog_entry > + - mk_message_entry > + - diffstat > + - message > + - mk_form > +

2 3

Re: [LrdeTools] 252: Forbid commits with unrecognized files.
by Akim Demaille 30 Sep '05

30 Sep '05

>>> "Nicolas" == Nicolas Pouillard <ertai(a)lrde.epita.fr> writes: > + raise Failure, " > + |You have unrecognized files in your working copy ! pas d'espace devant la ponctuation. > + |This meant that these files won't be commited ! > + |You have some solutions to get rid of this limitation: Mauvaise phrase, c'est pas une limitation. > + |- You must put these files in some categories. > + | For instance you can rename these files and put a `+' before > + | to make it `precious': > + | put `,' for `junk' > + | put `\\' for `unmask' > + | put `-' for `exclude' > + |- You can also edit your configuration file (.vcs) to customize > + | these categories. For example add this: > + | ------------ .vcs ------------ > + | precious: > + | - !re my_precious_file[0-9]* > + | - !re .*\.patch > + | ------------ .vcs ------------ > + |- You can also perform a partial commit and specify which files > + | and directories commit. For example this command: > + | #{@command} commit foo.c bar/ > + | > + |Commit failed".head_cut! > + end > + > Vcs.commited = edit_form!(files) > message(files)

2 1

Re: [LrdeTools] 255: Fix a bug woth error handlers.
by Akim Demaille 30 Sep '05

30 Sep '05

>>> "Nicolas" == Nicolas Pouillard <ertai(a)lrde.epita.fr> writes: > https://svn.lrde.epita.fr/svn/lrdetools/trunk > Index: ChangeLog > from Nicolas Pouillard <ertai(a)lrde.epita.fr> > Fix a bug woth error handlers. Il faudrait sans doute mettre un correcteur orthographique...

2 1

Re: [LrdeTools] 248: Add the junk command.
by Akim Demaille 30 Sep '05

30 Sep '05

>>> "Nicolas" == Nicolas Pouillard <ertai(a)lrde.epita.fr> writes: > + # This command removes all junk files (by default all files begining with `,'). > + # Warning: this command removes some files that may contains some relevant contain relevant -> important > + # information. For example during a commit the information that you type is > + # stored in one of these `,files'. So be careful using this command. > + # See the user configuration to customize what is considered as a junk file. s/as//

2 1

Re: [LrdeTools] 253: Make default_commit happened just one time.
by Akim Demaille 30 Sep '05

30 Sep '05

>>> "Nicolas" == Nicolas Pouillard <ertai(a)lrde.epita.fr> writes: > + # This method can be called just one time to avoid conflicts Once. Point final. > def default_commit ( meth ) > + just_one_time do Ditto. > alias_command :commit, meth > alias_command :ci, meth > end > + end > end # class << self

1 0

Re: [LrdeTools] 252: Forbid commits with unrecognized files.
by Akim Demaille 30 Sep '05

30 Sep '05

>>> "Nicolas" == Nicolas Pouillard <ertai(a)lrde.epita.fr> writes: > https://svn.lrde.epita.fr/svn/lrdetools/trunk > Index: ChangeLog > from Nicolas Pouillard <ertai(a)lrde.epita.fr> > Forbid commits with unrecognized files. Excellente nouvelle !

1 0

Re: [LrdeTools] 237: Files categories: closer to GNU Arch.
by Akim Demaille 30 Sep '05

30 Sep '05

>>> "Nicolas" == Nicolas Pouillard <ertai(a)lrde.epita.fr> writes: > https://svn.lrde.epita.fr/svn/lrdetools/trunk > Index: ChangeLog > from Nicolas Pouillard <ertai(a)lrde.epita.fr> > Files categories: closer to GNU Arch. This is nice. And thanks for the acknowledgment.

1 0

[LrdeTools] 256: Fix a bug a block arity.
by Nicolas Pouillard 30 Sep '05

30 Sep '05

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Fix a bug a block arity. * vcs/lib/vcs/vcs.rb: Call with the error handler with an argument only if it can handle it. vcs.rb | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: vcs/lib/vcs/vcs.rb --- vcs/lib/vcs/vcs.rb (revision 255) +++ vcs/lib/vcs/vcs.rb (working copy) @@ -539,7 +539,7 @@ end def call_handlers - @@handlers.each { |k, v| v[k] } + @@handlers.each { |k, v| (v.arity.abs == 1)? v[k] : v[] } end def call_conf_checkers

1 0

[LrdeTools] 255: Fix a bug woth error handlers.
by Nicolas Pouillard 30 Sep '05

30 Sep '05

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Fix a bug woth error handlers. * vcs/lib/vcs/vcs.rb: Use a class variable to store them. * vcs/lib/vcs/app.rb: Split a line to store the real vcs instance. app.rb | 9 +++++++-- vcs.rb | 19 ++++++++++--------- 2 files changed, 17 insertions(+), 11 deletions(-) Index: vcs/lib/vcs/vcs.rb --- vcs/lib/vcs/vcs.rb (revision 254) +++ vcs/lib/vcs/vcs.rb (working copy) @@ -245,7 +245,6 @@ def initialize ( aCmd ) @cmd = aCmd.to_cmd - @handlers = Set.new @runner = Commands::Runners::System.new @h = HighLine.new self.cmd_data_factory = VcsCmdDataFactory.new(:output => STDOUT, :error => STDERR) @@ -329,6 +328,8 @@ delegate_to_cmd_data Vcs.output_io_methods @@checkers = Set.new + OrderedHash.import! + @@handlers = OHash.new def run! ( command, files=[], options={} ) flush @@ -417,18 +418,18 @@ def with_cache ( path=nil, description=nil, &block ) loc = block.source_location # FIXME verify that this type of cache is working return @@cache[loc].dup if @@cache.has_key? loc - if path.exist? - logger.info "#{path} already exists" - return path.read - end unless path.nil? if description.nil? raise ArgumentError, "need a description for #{path}" end - error_handling do + error_handling(path) do logger.info "#{path}: Contains your #{description}" if path.exist? end end + if path.exist? + logger.info "#{path} already exists" + return path.read + end begin logger.info "Creating a new `#{path}' file ..." path.open('w') { |f| result = with(f, &block) } @@ -533,12 +534,12 @@ alias_command :checkin, :commit alias_command :populate, :add - def error_handling ( meth=nil, &block ) - @handlers << ((block.nil?)? method(meth) : block) + def error_handling ( meth_or_path, &block ) + @@handlers[meth_or_path] = (block.nil?)? method(meth_or_path) : block end def call_handlers - @handlers.each { |block| block[] } + @@handlers.each { |k, v| v[k] } end def call_conf_checkers Index: vcs/lib/vcs/app.rb --- vcs/lib/vcs/app.rb (revision 254) +++ vcs/lib/vcs/app.rb (working copy) @@ -106,12 +106,17 @@ ".head_cut! exit end - vcs = @@all_vcs[Vcs.default.to_s.downcase.to_sym].new.run_argv(ARGV) + vcs = @@all_vcs[Vcs.default.to_s.downcase.to_sym].new + vcs.run_argv(ARGV) rescue SystemExit => ex raise ex rescue Exception => ex - vcs.call_handlers unless vcs.nil? + if vcs.nil? + logger.error { "No Vcs instanciated" } + else + vcs.call_handlers + end err = ex.to_s.sub(/\.$/, '') logger.debug { err = ex.long_pp ; "Backtrace enabled:" } err = ex.inspect if err.empty?

1 0