23084300327

Committed 14 Mar 2026 08:29AM UTC coverage: 64.122% (-0.03%) from 64.153%

Build # 23084300327

Build Type

push

github

Committed by

web-flow

Commit Message

Merge to master (#1190)

* started with 26.04, added more const to chrono (#1012)

* 1013 add regex option to git grep (#1014)

* added regex option to git grep

* fixed lint error

* simplify get_branch (#1017)

* log_none respects trace level logging (#1019)

* 1020 allow skip micro and revision number (#1021)

* allow explicitly excluding micro and revision number

* mention change

* update version dialog as well

* 1015 make msw debug artefact for feature branches (#1022)

* use debug build for feature branches, and add sample as artefact

* added setting bevOverwrite

* use older version

* use github variables

* added quotes

* fix name

* use github.ref_name

* added script to get build config, use in ci-msw.yml

* remove trailing whitespace

* fixed compile error (?)

* updated condition

* updated condition

* added allow-failure

* use continue on error

* 1023 add url for open group base specs (#1024)

* added url for open group base specs

* fxing lint

* improve opening links (#1026)

* 1027 cmdline improve (#1028)

* cmdline improvement on options

* updated option for version

* use more std::ranges::contains (#1030)

* improve regex to find paths in lines (#1032)

* moved get_abbreviations from test library to test ex (#1034)

* use ProcessPendingEvents instead of wxYield (#1037)

* fix git admin dir in tests (#1039)

* 1035 fix crash on windows for git show (#1040)

* reenabled the execute-show test for msw, and added mayfail flag

* some test updates

* reenabled other windows tests for wex::vcs_entry

* upgrade boost version, clearified names

* try fixing crash, in debug mode it is OK

* 1041 fix hypertext auto complete (#1043)

* fixed hypertext complete, upgrade boost on ci ubuntu

* fix linter error

* fix ranges::all_of warning (#1045)

* fix recording inc macro, by using control k for it (#1046)

* removed K accelerator (#1048)

* 1049 no auto in public interface (#1050)

* no auto in public interface

* no auto in public in... (continued)

Coverage Stats

18596 of 31859 branches covered (58.37%)

Branch coverage included in aggregate %.

14825 of 20262 relevant lines covered (73.17%)

1490.48 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

35.71

/src/vcs/unified-diff.cpp

////////////////////////////////////////////////////////////////////////////////
// Name:      unified-diff.cpp
// Purpose:   Implementation of class wex::unified_diff
//            https://www.gnu.org/software/diffutils/manual/html_node/Detailed-Unified.html
// Author:    Anton van Wezenbeek
// Copyright: (c) 2024 Anton van Wezenbeek
////////////////////////////////////////////////////////////////////////////////

#include <wex/core/log.h>
#include <wex/factory/frame.h>
#include <wex/vcs/unified-diff.h>
#include <wex/vcs/vcs-entry.h>
#include <wex/vcs/vcs.h>

wex::unified_diff::unified_diff(
  const path&      p,
  const vcs_entry* e,
  factory::frame*  f)
  : factory::unified_diff(e->std_out())
  , m_path_vcs(p)
  , m_frame(f)
  , m_path_toplevel(vcs().toplevel())
  , m_vcs_entry(e)
{
  m_frame->page_save();
}

bool wex::unified_diff::report_diff()
{
  m_path_vcs = path(m_path_toplevel).append(m_path[0]);

  if (!m_path_vcs.dir_exists())
  {
    if (!m_path_vcs.file_exists())
    {
      log("unified_diff") << m_path_vcs.string() << "does not exist";
      return false;
    }

    if (!m_frame->vcs_unified_diff(m_vcs_entry, this))
    {
      return false;
    }
  }

  return true;
}

void wex::unified_diff::report_diff_finish()
{
  m_frame->vcs_unified_diff(m_vcs_entry, this);
  m_frame->page_restore();
}

1	////////////////////////////////////////////////////////////////////////////////
2	// Name: unified-diff.cpp
3	// Purpose: Implementation of class wex::unified_diff
4	// https://www.gnu.org/software/diffutils/manual/html_node/Detailed-Unified.html
5	// Author: Anton van Wezenbeek
6	// Copyright: (c) 2024 Anton van Wezenbeek
7	////////////////////////////////////////////////////////////////////////////////
8
9	#include <wex/core/log.h>
10	#include <wex/factory/frame.h>
11	#include <wex/vcs/unified-diff.h>
12	#include <wex/vcs/vcs-entry.h>
13	#include <wex/vcs/vcs.h>
14
15	wex::unified_diff::unified_diff(	1✔
16	const path& p,
17	const vcs_entry* e,
18	factory::frame* f)	1✔
19	: factory::unified_diff(e->std_out())	1✔
20	, m_path_vcs(p)	1✔
21	, m_frame(f)	1✔
22	, m_path_toplevel(vcs().toplevel())	1✔
23	, m_vcs_entry(e)	1✔
24	{
25	m_frame->page_save();	1✔
26	}	1✔
27
28	bool wex::unified_diff::report_diff()	×
29	{
30	m_path_vcs = path(m_path_toplevel).append(m_path[0]);	×
31
32	if (!m_path_vcs.dir_exists())	×
33	{
34	if (!m_path_vcs.file_exists())	×
35	{
36	log("unified_diff") << m_path_vcs.string() << "does not exist";	×
37	return false;	×
38	}
39
40	if (!m_frame->vcs_unified_diff(m_vcs_entry, this))	×
41	{
42	return false;	×
43	}
44	}
45
46	return true;	×
47	}
48
49	void wex::unified_diff::report_diff_finish()	×
50	{
51	m_frame->vcs_unified_diff(m_vcs_entry, this);	×
52	m_frame->page_restore();	×
53	}	×

antonvw / wex / 23084300327

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous